regenerate proper namespaced code for other 3 interfaces, fix their includes accordingly

6 files changed, 6303 insertions, 3769 deletions

diff --git a/src/interfaces/localed/localed-gen.c b/src/interfaces/localed/localed-gen.c
index 3ab36a1..a73429c 100644
--- a/src/interfaces/localed/localed-gen.c
+++ b/src/interfaces/localed/localed-gen.c
@@ -8,7 +8,7 @@
 #  include "config.h"
 #endif
 
-#include "src/interfaces/localed/localed-gen.h"
+#include "localed-gen.h"
 
 #include <string.h>
 #ifdef G_OS_UNIX
@@ -154,8 +154,8 @@ _g_value_equal (const GValue *a, const GValue *b)
  */
 
 /**
- * SECTION:Locale1
- * @title: Locale1
+ * SECTION:localedLocale1
+ * @title: localedLocale1
  * @short_description: Generated C code for the org.freedesktop.locale1 D-Bus interface
  *
  * This section contains code for working with the <link linkend="gdbus-interface-org-freedesktop-locale1.top_of_page">org.freedesktop.locale1</link> D-Bus interface in C.
@@ -163,41 +163,41 @@ _g_value_equal (const GValue *a, const GValue *b)
 
 /* ---- Introspection data for org.freedesktop.locale1 ---- */
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_locale_IN_ARG_locale =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_locale_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
-    (gchar *) "locale",
+    (gchar *) "unnamed_arg0",
     (gchar *) "as",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_locale_IN_ARG_user_interaction =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_locale_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
-    (gchar *) "user_interaction",
+    (gchar *) "unnamed_arg1",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _locale1_method_info_set_locale_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _localed_locale1_method_info_set_locale_IN_ARG_pointers[] =
 {
-  &_locale1_method_info_set_locale_IN_ARG_locale,
-  &_locale1_method_info_set_locale_IN_ARG_user_interaction,
+  &_localed_locale1_method_info_set_locale_IN_ARG_unnamed_arg0,
+  &_localed_locale1_method_info_set_locale_IN_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _locale1_method_info_set_locale =
+static const _ExtendedGDBusMethodInfo _localed_locale1_method_info_set_locale =
 {
   {
     -1,
     (gchar *) "SetLocale",
-    (GDBusArgInfo **) &_locale1_method_info_set_locale_IN_ARG_pointers,
+    (GDBusArgInfo **) &_localed_locale1_method_info_set_locale_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -205,65 +205,65 @@ static const _ExtendedGDBusMethodInfo _locale1_method_info_set_locale =
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_vconsole_keyboard_IN_ARG_keymap =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
-    (gchar *) "keymap",
+    (gchar *) "unnamed_arg0",
     (gchar *) "s",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_vconsole_keyboard_IN_ARG_keymap_toggle =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
-    (gchar *) "keymap_toggle",
+    (gchar *) "unnamed_arg1",
     (gchar *) "s",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_vconsole_keyboard_IN_ARG_convert =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_unnamed_arg2 =
 {
   {
     -1,
-    (gchar *) "convert",
+    (gchar *) "unnamed_arg2",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_vconsole_keyboard_IN_ARG_user_interaction =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_unnamed_arg3 =
 {
   {
     -1,
-    (gchar *) "user_interaction",
+    (gchar *) "unnamed_arg3",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _locale1_method_info_set_vconsole_keyboard_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_pointers[] =
 {
-  &_locale1_method_info_set_vconsole_keyboard_IN_ARG_keymap,
-  &_locale1_method_info_set_vconsole_keyboard_IN_ARG_keymap_toggle,
-  &_locale1_method_info_set_vconsole_keyboard_IN_ARG_convert,
-  &_locale1_method_info_set_vconsole_keyboard_IN_ARG_user_interaction,
+  &_localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_unnamed_arg0,
+  &_localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_unnamed_arg1,
+  &_localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_unnamed_arg2,
+  &_localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_unnamed_arg3,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _locale1_method_info_set_vconsole_keyboard =
+static const _ExtendedGDBusMethodInfo _localed_locale1_method_info_set_vconsole_keyboard =
 {
   {
     -1,
     (gchar *) "SetVConsoleKeyboard",
-    (GDBusArgInfo **) &_locale1_method_info_set_vconsole_keyboard_IN_ARG_pointers,
+    (GDBusArgInfo **) &_localed_locale1_method_info_set_vconsole_keyboard_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -271,89 +271,89 @@ static const _ExtendedGDBusMethodInfo _locale1_method_info_set_vconsole_keyboard
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_x11_keyboard_IN_ARG_layout =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
-    (gchar *) "layout",
+    (gchar *) "unnamed_arg0",
     (gchar *) "s",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_x11_keyboard_IN_ARG_model =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
-    (gchar *) "model",
+    (gchar *) "unnamed_arg1",
     (gchar *) "s",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_x11_keyboard_IN_ARG_variant =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg2 =
 {
   {
     -1,
-    (gchar *) "variant",
+    (gchar *) "unnamed_arg2",
     (gchar *) "s",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_x11_keyboard_IN_ARG_options =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg3 =
 {
   {
     -1,
-    (gchar *) "options",
+    (gchar *) "unnamed_arg3",
     (gchar *) "s",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_x11_keyboard_IN_ARG_convert =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg4 =
 {
   {
     -1,
-    (gchar *) "convert",
+    (gchar *) "unnamed_arg4",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _locale1_method_info_set_x11_keyboard_IN_ARG_user_interaction =
+static const _ExtendedGDBusArgInfo _localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg5 =
 {
   {
     -1,
-    (gchar *) "user_interaction",
+    (gchar *) "unnamed_arg5",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _locale1_method_info_set_x11_keyboard_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _localed_locale1_method_info_set_x11_keyboard_IN_ARG_pointers[] =
 {
-  &_locale1_method_info_set_x11_keyboard_IN_ARG_layout,
-  &_locale1_method_info_set_x11_keyboard_IN_ARG_model,
-  &_locale1_method_info_set_x11_keyboard_IN_ARG_variant,
-  &_locale1_method_info_set_x11_keyboard_IN_ARG_options,
-  &_locale1_method_info_set_x11_keyboard_IN_ARG_convert,
-  &_locale1_method_info_set_x11_keyboard_IN_ARG_user_interaction,
+  &_localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg0,
+  &_localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg1,
+  &_localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg2,
+  &_localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg3,
+  &_localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg4,
+  &_localed_locale1_method_info_set_x11_keyboard_IN_ARG_unnamed_arg5,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _locale1_method_info_set_x11_keyboard =
+static const _ExtendedGDBusMethodInfo _localed_locale1_method_info_set_x11_keyboard =
 {
   {
     -1,
     (gchar *) "SetX11Keyboard",
-    (GDBusArgInfo **) &_locale1_method_info_set_x11_keyboard_IN_ARG_pointers,
+    (GDBusArgInfo **) &_localed_locale1_method_info_set_x11_keyboard_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -361,15 +361,15 @@ static const _ExtendedGDBusMethodInfo _locale1_method_info_set_x11_keyboard =
   FALSE
 };
 
-static const _ExtendedGDBusMethodInfo * const _locale1_method_info_pointers[] =
+static const _ExtendedGDBusMethodInfo * const _localed_locale1_method_info_pointers[] =
 {
-  &_locale1_method_info_set_locale,
-  &_locale1_method_info_set_vconsole_keyboard,
-  &_locale1_method_info_set_x11_keyboard,
+  &_localed_locale1_method_info_set_locale,
+  &_localed_locale1_method_info_set_vconsole_keyboard,
+  &_localed_locale1_method_info_set_x11_keyboard,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _locale1_property_info_locale =
+static const _ExtendedGDBusPropertyInfo _localed_locale1_property_info_locale =
 {
   {
     -1,
@@ -382,104 +382,104 @@ static const _ExtendedGDBusPropertyInfo _locale1_property_info_locale =
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _locale1_property_info_vconsole_keymap =
+static const _ExtendedGDBusPropertyInfo _localed_locale1_property_info_x11_layout =
 {
   {
     -1,
-    (gchar *) "VConsoleKeymap",
+    (gchar *) "X11Layout",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
     NULL
   },
-  "vconsole-keymap",
+  "x11-layout",
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _locale1_property_info_vconsole_keymap_toggle =
+static const _ExtendedGDBusPropertyInfo _localed_locale1_property_info_x11_model =
 {
   {
     -1,
-    (gchar *) "VConsoleKeymapToggle",
+    (gchar *) "X11Model",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
     NULL
   },
-  "vconsole-keymap-toggle",
+  "x11-model",
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _locale1_property_info_x11_layout =
+static const _ExtendedGDBusPropertyInfo _localed_locale1_property_info_x11_variant =
 {
   {
     -1,
-    (gchar *) "X11Layout",
+    (gchar *) "X11Variant",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
     NULL
   },
-  "x11-layout",
+  "x11-variant",
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _locale1_property_info_x11_model =
+static const _ExtendedGDBusPropertyInfo _localed_locale1_property_info_x11_options =
 {
   {
     -1,
-    (gchar *) "X11Model",
+    (gchar *) "X11Options",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
     NULL
   },
-  "x11-model",
+  "x11-options",
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _locale1_property_info_x11_variant =
+static const _ExtendedGDBusPropertyInfo _localed_locale1_property_info_vconsole_keymap =
 {
   {
     -1,
-    (gchar *) "X11Variant",
+    (gchar *) "VConsoleKeymap",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
     NULL
   },
-  "x11-variant",
+  "vconsole-keymap",
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _locale1_property_info_x11_options =
+static const _ExtendedGDBusPropertyInfo _localed_locale1_property_info_vconsole_keymap_toggle =
 {
   {
     -1,
-    (gchar *) "X11Options",
+    (gchar *) "VConsoleKeymapToggle",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
     NULL
   },
-  "x11-options",
+  "vconsole-keymap-toggle",
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo * const _locale1_property_info_pointers[] =
+static const _ExtendedGDBusPropertyInfo * const _localed_locale1_property_info_pointers[] =
 {
-  &_locale1_property_info_locale,
-  &_locale1_property_info_vconsole_keymap,
-  &_locale1_property_info_vconsole_keymap_toggle,
-  &_locale1_property_info_x11_layout,
-  &_locale1_property_info_x11_model,
-  &_locale1_property_info_x11_variant,
-  &_locale1_property_info_x11_options,
+  &_localed_locale1_property_info_locale,
+  &_localed_locale1_property_info_x11_layout,
+  &_localed_locale1_property_info_x11_model,
+  &_localed_locale1_property_info_x11_variant,
+  &_localed_locale1_property_info_x11_options,
+  &_localed_locale1_property_info_vconsole_keymap,
+  &_localed_locale1_property_info_vconsole_keymap_toggle,
   NULL
 };
 
-static const _ExtendedGDBusInterfaceInfo _locale1_interface_info =
+static const _ExtendedGDBusInterfaceInfo _localed_locale1_interface_info =
 {
   {
     -1,
     (gchar *) "org.freedesktop.locale1",
-    (GDBusMethodInfo **) &_locale1_method_info_pointers,
+    (GDBusMethodInfo **) &_localed_locale1_method_info_pointers,
     NULL,
-    (GDBusPropertyInfo **) &_locale1_property_info_pointers,
+    (GDBusPropertyInfo **) &_localed_locale1_property_info_pointers,
     NULL
   },
   "locale1",
@@ -487,90 +487,90 @@ static const _ExtendedGDBusInterfaceInfo _locale1_interface_info =
 
 
 /**
- * locale1_interface_info:
+ * localed_locale1_interface_info:
  *
  * Gets a machine-readable description of the <link linkend="gdbus-interface-org-freedesktop-locale1.top_of_page">org.freedesktop.locale1</link> D-Bus interface.
  *
  * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
  */
 GDBusInterfaceInfo *
-locale1_interface_info (void)
+localed_locale1_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_locale1_interface_info.parent_struct;
+  return (GDBusInterfaceInfo *) &_localed_locale1_interface_info.parent_struct;
 }
 
 /**
- * locale1_override_properties:
+ * localed_locale1_override_properties:
  * @klass: The class structure for a #GObject<!-- -->-derived class.
  * @property_id_begin: The property id to assign to the first overridden property.
  *
- * Overrides all #GObject properties in the #Locale1 interface for a concrete class.
+ * Overrides all #GObject properties in the #localedLocale1 interface for a concrete class.
  * The properties are overridden in the order they are defined.
  *
  * Returns: The last property id.
  */
 guint
-locale1_override_properties (GObjectClass *klass, guint property_id_begin)
+localed_locale1_override_properties (GObjectClass *klass, guint property_id_begin)
 {
   g_object_class_override_property (klass, property_id_begin++, "locale");
-  g_object_class_override_property (klass, property_id_begin++, "vconsole-keymap");
-  g_object_class_override_property (klass, property_id_begin++, "vconsole-keymap-toggle");
   g_object_class_override_property (klass, property_id_begin++, "x11-layout");
   g_object_class_override_property (klass, property_id_begin++, "x11-model");
   g_object_class_override_property (klass, property_id_begin++, "x11-variant");
   g_object_class_override_property (klass, property_id_begin++, "x11-options");
+  g_object_class_override_property (klass, property_id_begin++, "vconsole-keymap");
+  g_object_class_override_property (klass, property_id_begin++, "vconsole-keymap-toggle");
   return property_id_begin - 1;
 }
 
 
 
 /**
- * Locale1:
+ * localedLocale1:
  *
  * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-locale1.top_of_page">org.freedesktop.locale1</link>.
  */
 
 /**
- * Locale1Iface:
+ * localedLocale1Iface:
  * @parent_iface: The parent interface.
- * @handle_set_locale: Handler for the #Locale1::handle-set-locale signal.
- * @handle_set_vconsole_keyboard: Handler for the #Locale1::handle-set-vconsole-keyboard signal.
- * @handle_set_x11_keyboard: Handler for the #Locale1::handle-set-x11-keyboard signal.
- * @get_locale: Getter for the #Locale1:locale property.
- * @get_vconsole_keymap: Getter for the #Locale1:vconsole-keymap property.
- * @get_vconsole_keymap_toggle: Getter for the #Locale1:vconsole-keymap-toggle property.
- * @get_x11_layout: Getter for the #Locale1:x11-layout property.
- * @get_x11_model: Getter for the #Locale1:x11-model property.
- * @get_x11_options: Getter for the #Locale1:x11-options property.
- * @get_x11_variant: Getter for the #Locale1:x11-variant property.
+ * @handle_set_locale: Handler for the #localedLocale1::handle-set-locale signal.
+ * @handle_set_vconsole_keyboard: Handler for the #localedLocale1::handle-set-vconsole-keyboard signal.
+ * @handle_set_x11_keyboard: Handler for the #localedLocale1::handle-set-x11-keyboard signal.
+ * @get_locale: Getter for the #localedLocale1:locale property.
+ * @get_vconsole_keymap: Getter for the #localedLocale1:vconsole-keymap property.
+ * @get_vconsole_keymap_toggle: Getter for the #localedLocale1:vconsole-keymap-toggle property.
+ * @get_x11_layout: Getter for the #localedLocale1:x11-layout property.
+ * @get_x11_model: Getter for the #localedLocale1:x11-model property.
+ * @get_x11_options: Getter for the #localedLocale1:x11-options property.
+ * @get_x11_variant: Getter for the #localedLocale1:x11-variant property.
  *
  * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-locale1.top_of_page">org.freedesktop.locale1</link>.
  */
 
-typedef Locale1Iface Locale1Interface;
-G_DEFINE_INTERFACE (Locale1, locale1, G_TYPE_OBJECT);
+typedef localedLocale1Iface localedLocale1Interface;
+G_DEFINE_INTERFACE (localedLocale1, localed_locale1, G_TYPE_OBJECT);
 
 static void
-locale1_default_init (Locale1Iface *iface)
+localed_locale1_default_init (localedLocale1Iface *iface)
 {
   /* GObject signals for incoming D-Bus method calls: */
   /**
-   * Locale1::handle-set-locale:
-   * @object: A #Locale1.
+   * localedLocale1::handle-set-locale:
+   * @object: A #localedLocale1.
    * @invocation: A #GDBusMethodInvocation.
-   * @arg_locale: Argument passed by remote caller.
-   * @arg_user_interaction: Argument passed by remote caller.
+   * @arg_unnamed_arg0: Argument passed by remote caller.
+   * @arg_unnamed_arg1: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-locale1.SetLocale">SetLocale()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call locale1_complete_set_locale() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call localed_locale1_complete_set_locale() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-set-locale",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Locale1Iface, handle_set_locale),
+    G_STRUCT_OFFSET (localedLocale1Iface, handle_set_locale),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -579,24 +579,24 @@ locale1_default_init (Locale1Iface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRV, G_TYPE_BOOLEAN);
 
   /**
-   * Locale1::handle-set-vconsole-keyboard:
-   * @object: A #Locale1.
+   * localedLocale1::handle-set-vconsole-keyboard:
+   * @object: A #localedLocale1.
    * @invocation: A #GDBusMethodInvocation.
-   * @arg_keymap: Argument passed by remote caller.
-   * @arg_keymap_toggle: Argument passed by remote caller.
-   * @arg_convert: Argument passed by remote caller.
-   * @arg_user_interaction: Argument passed by remote caller.
+   * @arg_unnamed_arg0: Argument passed by remote caller.
+   * @arg_unnamed_arg1: Argument passed by remote caller.
+   * @arg_unnamed_arg2: Argument passed by remote caller.
+   * @arg_unnamed_arg3: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-locale1.SetVConsoleKeyboard">SetVConsoleKeyboard()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call locale1_complete_set_vconsole_keyboard() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call localed_locale1_complete_set_vconsole_keyboard() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-set-vconsole-keyboard",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Locale1Iface, handle_set_vconsole_keyboard),
+    G_STRUCT_OFFSET (localedLocale1Iface, handle_set_vconsole_keyboard),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -605,26 +605,26 @@ locale1_default_init (Locale1Iface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 
   /**
-   * Locale1::handle-set-x11-keyboard:
-   * @object: A #Locale1.
+   * localedLocale1::handle-set-x11-keyboard:
+   * @object: A #localedLocale1.
    * @invocation: A #GDBusMethodInvocation.
-   * @arg_layout: Argument passed by remote caller.
-   * @arg_model: Argument passed by remote caller.
-   * @arg_variant: Argument passed by remote caller.
-   * @arg_options: Argument passed by remote caller.
-   * @arg_convert: Argument passed by remote caller.
-   * @arg_user_interaction: Argument passed by remote caller.
+   * @arg_unnamed_arg0: Argument passed by remote caller.
+   * @arg_unnamed_arg1: Argument passed by remote caller.
+   * @arg_unnamed_arg2: Argument passed by remote caller.
+   * @arg_unnamed_arg3: Argument passed by remote caller.
+   * @arg_unnamed_arg4: Argument passed by remote caller.
+   * @arg_unnamed_arg5: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-locale1.SetX11Keyboard">SetX11Keyboard()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call locale1_complete_set_x11_keyboard() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call localed_locale1_complete_set_x11_keyboard() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-set-x11-keyboard",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Locale1Iface, handle_set_x11_keyboard),
+    G_STRUCT_OFFSET (localedLocale1Iface, handle_set_x11_keyboard),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -634,7 +634,7 @@ locale1_default_init (Locale1Iface *iface)
 
   /* GObject properties for D-Bus properties: */
   /**
-   * Locale1:locale:
+   * localedLocale1:locale:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.Locale">"Locale"</link>.
    *
@@ -643,82 +643,82 @@ locale1_default_init (Locale1Iface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_boxed ("locale", "Locale", "Locale", G_TYPE_STRV, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Locale1:vconsole-keymap:
+   * localedLocale1:x11-layout:
    *
-   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymap">"VConsoleKeymap"</link>.
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.X11Layout">"X11Layout"</link>.
    *
    * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
    */
   g_object_interface_install_property (iface,
-    g_param_spec_string ("vconsole-keymap", "VConsoleKeymap", "VConsoleKeymap", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    g_param_spec_string ("x11-layout", "X11Layout", "X11Layout", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Locale1:vconsole-keymap-toggle:
+   * localedLocale1:x11-model:
    *
-   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymapToggle">"VConsoleKeymapToggle"</link>.
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.X11Model">"X11Model"</link>.
    *
    * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
    */
   g_object_interface_install_property (iface,
-    g_param_spec_string ("vconsole-keymap-toggle", "VConsoleKeymapToggle", "VConsoleKeymapToggle", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    g_param_spec_string ("x11-model", "X11Model", "X11Model", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Locale1:x11-layout:
+   * localedLocale1:x11-variant:
    *
-   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.X11Layout">"X11Layout"</link>.
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.X11Variant">"X11Variant"</link>.
    *
    * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
    */
   g_object_interface_install_property (iface,
-    g_param_spec_string ("x11-layout", "X11Layout", "X11Layout", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    g_param_spec_string ("x11-variant", "X11Variant", "X11Variant", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Locale1:x11-model:
+   * localedLocale1:x11-options:
    *
-   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.X11Model">"X11Model"</link>.
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.X11Options">"X11Options"</link>.
    *
    * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
    */
   g_object_interface_install_property (iface,
-    g_param_spec_string ("x11-model", "X11Model", "X11Model", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    g_param_spec_string ("x11-options", "X11Options", "X11Options", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Locale1:x11-variant:
+   * localedLocale1:vconsole-keymap:
    *
-   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.X11Variant">"X11Variant"</link>.
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymap">"VConsoleKeymap"</link>.
    *
    * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
    */
   g_object_interface_install_property (iface,
-    g_param_spec_string ("x11-variant", "X11Variant", "X11Variant", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    g_param_spec_string ("vconsole-keymap", "VConsoleKeymap", "VConsoleKeymap", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Locale1:x11-options:
+   * localedLocale1:vconsole-keymap-toggle:
    *
-   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.X11Options">"X11Options"</link>.
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymapToggle">"VConsoleKeymapToggle"</link>.
    *
    * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
    */
   g_object_interface_install_property (iface,
-    g_param_spec_string ("x11-options", "X11Options", "X11Options", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    g_param_spec_string ("vconsole-keymap-toggle", "VConsoleKeymapToggle", "VConsoleKeymapToggle", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 /**
- * locale1_get_locale: (skip)
- * @object: A #Locale1.
+ * localed_locale1_get_locale: (skip)
+ * @object: A #localedLocale1.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.Locale">"Locale"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use locale1_dup_locale() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use localed_locale1_dup_locale() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *const *
-locale1_get_locale (Locale1 *object)
+localed_locale1_get_locale (localedLocale1 *object)
 {
-  return LOCALE1_GET_IFACE (object)->get_locale (object);
+  return LOCALED_LOCALE1_GET_IFACE (object)->get_locale (object);
 }
 
 /**
- * locale1_dup_locale: (skip)
- * @object: A #Locale1.
+ * localed_locale1_dup_locale: (skip)
+ * @object: A #localedLocale1.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.Locale">"Locale"</link> D-Bus property.
  *
@@ -727,7 +727,7 @@ locale1_get_locale (Locale1 *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_strfreev().
  */
 gchar **
-locale1_dup_locale (Locale1 *object)
+localed_locale1_dup_locale (localedLocale1 *object)
 {
   gchar **value;
   g_object_get (G_OBJECT (object), "locale", &value, NULL);
@@ -735,8 +735,8 @@ locale1_dup_locale (Locale1 *object)
 }
 
 /**
- * locale1_set_locale: (skip)
- * @object: A #Locale1.
+ * localed_locale1_set_locale: (skip)
+ * @object: A #localedLocale1.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.Locale">"Locale"</link> D-Bus property to @value.
@@ -744,337 +744,337 @@ locale1_dup_locale (Locale1 *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-locale1_set_locale (Locale1 *object, const gchar *const *value)
+localed_locale1_set_locale (localedLocale1 *object, const gchar *const *value)
 {
   g_object_set (G_OBJECT (object), "locale", value, NULL);
 }
 
 /**
- * locale1_get_vconsole_keymap: (skip)
- * @object: A #Locale1.
+ * localed_locale1_get_x11_layout: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymap">"VConsoleKeymap"</link> D-Bus property.
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Layout">"X11Layout"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use locale1_dup_vconsole_keymap() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use localed_locale1_dup_x11_layout() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-locale1_get_vconsole_keymap (Locale1 *object)
+localed_locale1_get_x11_layout (localedLocale1 *object)
 {
-  return LOCALE1_GET_IFACE (object)->get_vconsole_keymap (object);
+  return LOCALED_LOCALE1_GET_IFACE (object)->get_x11_layout (object);
 }
 
 /**
- * locale1_dup_vconsole_keymap: (skip)
- * @object: A #Locale1.
+ * localed_locale1_dup_x11_layout: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymap">"VConsoleKeymap"</link> D-Bus property.
+ * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Layout">"X11Layout"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-locale1_dup_vconsole_keymap (Locale1 *object)
+localed_locale1_dup_x11_layout (localedLocale1 *object)
 {
   gchar *value;
-  g_object_get (G_OBJECT (object), "vconsole-keymap", &value, NULL);
+  g_object_get (G_OBJECT (object), "x11-layout", &value, NULL);
   return value;
 }
 
 /**
- * locale1_set_vconsole_keymap: (skip)
- * @object: A #Locale1.
+ * localed_locale1_set_x11_layout: (skip)
+ * @object: A #localedLocale1.
  * @value: The value to set.
  *
- * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymap">"VConsoleKeymap"</link> D-Bus property to @value.
+ * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.X11Layout">"X11Layout"</link> D-Bus property to @value.
  *
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-locale1_set_vconsole_keymap (Locale1 *object, const gchar *value)
+localed_locale1_set_x11_layout (localedLocale1 *object, const gchar *value)
 {
-  g_object_set (G_OBJECT (object), "vconsole-keymap", value, NULL);
+  g_object_set (G_OBJECT (object), "x11-layout", value, NULL);
 }
 
 /**
- * locale1_get_vconsole_keymap_toggle: (skip)
- * @object: A #Locale1.
+ * localed_locale1_get_x11_model: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymapToggle">"VConsoleKeymapToggle"</link> D-Bus property.
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Model">"X11Model"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use locale1_dup_vconsole_keymap_toggle() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use localed_locale1_dup_x11_model() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-locale1_get_vconsole_keymap_toggle (Locale1 *object)
+localed_locale1_get_x11_model (localedLocale1 *object)
 {
-  return LOCALE1_GET_IFACE (object)->get_vconsole_keymap_toggle (object);
+  return LOCALED_LOCALE1_GET_IFACE (object)->get_x11_model (object);
 }
 
 /**
- * locale1_dup_vconsole_keymap_toggle: (skip)
- * @object: A #Locale1.
+ * localed_locale1_dup_x11_model: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymapToggle">"VConsoleKeymapToggle"</link> D-Bus property.
+ * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Model">"X11Model"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-locale1_dup_vconsole_keymap_toggle (Locale1 *object)
+localed_locale1_dup_x11_model (localedLocale1 *object)
 {
   gchar *value;
-  g_object_get (G_OBJECT (object), "vconsole-keymap-toggle", &value, NULL);
+  g_object_get (G_OBJECT (object), "x11-model", &value, NULL);
   return value;
 }
 
 /**
- * locale1_set_vconsole_keymap_toggle: (skip)
- * @object: A #Locale1.
+ * localed_locale1_set_x11_model: (skip)
+ * @object: A #localedLocale1.
  * @value: The value to set.
  *
- * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymapToggle">"VConsoleKeymapToggle"</link> D-Bus property to @value.
+ * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.X11Model">"X11Model"</link> D-Bus property to @value.
  *
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-locale1_set_vconsole_keymap_toggle (Locale1 *object, const gchar *value)
+localed_locale1_set_x11_model (localedLocale1 *object, const gchar *value)
 {
-  g_object_set (G_OBJECT (object), "vconsole-keymap-toggle", value, NULL);
+  g_object_set (G_OBJECT (object), "x11-model", value, NULL);
 }
 
 /**
- * locale1_get_x11_layout: (skip)
- * @object: A #Locale1.
+ * localed_locale1_get_x11_variant: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Layout">"X11Layout"</link> D-Bus property.
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Variant">"X11Variant"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use locale1_dup_x11_layout() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use localed_locale1_dup_x11_variant() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-locale1_get_x11_layout (Locale1 *object)
+localed_locale1_get_x11_variant (localedLocale1 *object)
 {
-  return LOCALE1_GET_IFACE (object)->get_x11_layout (object);
+  return LOCALED_LOCALE1_GET_IFACE (object)->get_x11_variant (object);
 }
 
 /**
- * locale1_dup_x11_layout: (skip)
- * @object: A #Locale1.
+ * localed_locale1_dup_x11_variant: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Layout">"X11Layout"</link> D-Bus property.
+ * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Variant">"X11Variant"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-locale1_dup_x11_layout (Locale1 *object)
+localed_locale1_dup_x11_variant (localedLocale1 *object)
 {
   gchar *value;
-  g_object_get (G_OBJECT (object), "x11-layout", &value, NULL);
+  g_object_get (G_OBJECT (object), "x11-variant", &value, NULL);
   return value;
 }
 
 /**
- * locale1_set_x11_layout: (skip)
- * @object: A #Locale1.
+ * localed_locale1_set_x11_variant: (skip)
+ * @object: A #localedLocale1.
  * @value: The value to set.
  *
- * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.X11Layout">"X11Layout"</link> D-Bus property to @value.
+ * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.X11Variant">"X11Variant"</link> D-Bus property to @value.
  *
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-locale1_set_x11_layout (Locale1 *object, const gchar *value)
+localed_locale1_set_x11_variant (localedLocale1 *object, const gchar *value)
 {
-  g_object_set (G_OBJECT (object), "x11-layout", value, NULL);
+  g_object_set (G_OBJECT (object), "x11-variant", value, NULL);
 }
 
 /**
- * locale1_get_x11_model: (skip)
- * @object: A #Locale1.
+ * localed_locale1_get_x11_options: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Model">"X11Model"</link> D-Bus property.
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Options">"X11Options"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use locale1_dup_x11_model() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use localed_locale1_dup_x11_options() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-locale1_get_x11_model (Locale1 *object)
+localed_locale1_get_x11_options (localedLocale1 *object)
 {
-  return LOCALE1_GET_IFACE (object)->get_x11_model (object);
+  return LOCALED_LOCALE1_GET_IFACE (object)->get_x11_options (object);
 }
 
 /**
- * locale1_dup_x11_model: (skip)
- * @object: A #Locale1.
+ * localed_locale1_dup_x11_options: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Model">"X11Model"</link> D-Bus property.
+ * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Options">"X11Options"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-locale1_dup_x11_model (Locale1 *object)
+localed_locale1_dup_x11_options (localedLocale1 *object)
 {
   gchar *value;
-  g_object_get (G_OBJECT (object), "x11-model", &value, NULL);
+  g_object_get (G_OBJECT (object), "x11-options", &value, NULL);
   return value;
 }
 
 /**
- * locale1_set_x11_model: (skip)
- * @object: A #Locale1.
+ * localed_locale1_set_x11_options: (skip)
+ * @object: A #localedLocale1.
  * @value: The value to set.
  *
- * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.X11Model">"X11Model"</link> D-Bus property to @value.
+ * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.X11Options">"X11Options"</link> D-Bus property to @value.
  *
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-locale1_set_x11_model (Locale1 *object, const gchar *value)
+localed_locale1_set_x11_options (localedLocale1 *object, const gchar *value)
 {
-  g_object_set (G_OBJECT (object), "x11-model", value, NULL);
+  g_object_set (G_OBJECT (object), "x11-options", value, NULL);
 }
 
 /**
- * locale1_get_x11_variant: (skip)
- * @object: A #Locale1.
+ * localed_locale1_get_vconsole_keymap: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Variant">"X11Variant"</link> D-Bus property.
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymap">"VConsoleKeymap"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use locale1_dup_x11_variant() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use localed_locale1_dup_vconsole_keymap() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-locale1_get_x11_variant (Locale1 *object)
+localed_locale1_get_vconsole_keymap (localedLocale1 *object)
 {
-  return LOCALE1_GET_IFACE (object)->get_x11_variant (object);
+  return LOCALED_LOCALE1_GET_IFACE (object)->get_vconsole_keymap (object);
 }
 
 /**
- * locale1_dup_x11_variant: (skip)
- * @object: A #Locale1.
+ * localed_locale1_dup_vconsole_keymap: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Variant">"X11Variant"</link> D-Bus property.
+ * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymap">"VConsoleKeymap"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-locale1_dup_x11_variant (Locale1 *object)
+localed_locale1_dup_vconsole_keymap (localedLocale1 *object)
 {
   gchar *value;
-  g_object_get (G_OBJECT (object), "x11-variant", &value, NULL);
+  g_object_get (G_OBJECT (object), "vconsole-keymap", &value, NULL);
   return value;
 }
 
 /**
- * locale1_set_x11_variant: (skip)
- * @object: A #Locale1.
+ * localed_locale1_set_vconsole_keymap: (skip)
+ * @object: A #localedLocale1.
  * @value: The value to set.
  *
- * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.X11Variant">"X11Variant"</link> D-Bus property to @value.
+ * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymap">"VConsoleKeymap"</link> D-Bus property to @value.
  *
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-locale1_set_x11_variant (Locale1 *object, const gchar *value)
+localed_locale1_set_vconsole_keymap (localedLocale1 *object, const gchar *value)
 {
-  g_object_set (G_OBJECT (object), "x11-variant", value, NULL);
+  g_object_set (G_OBJECT (object), "vconsole-keymap", value, NULL);
 }
 
 /**
- * locale1_get_x11_options: (skip)
- * @object: A #Locale1.
+ * localed_locale1_get_vconsole_keymap_toggle: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Options">"X11Options"</link> D-Bus property.
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymapToggle">"VConsoleKeymapToggle"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use locale1_dup_x11_options() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use localed_locale1_dup_vconsole_keymap_toggle() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-locale1_get_x11_options (Locale1 *object)
+localed_locale1_get_vconsole_keymap_toggle (localedLocale1 *object)
 {
-  return LOCALE1_GET_IFACE (object)->get_x11_options (object);
+  return LOCALED_LOCALE1_GET_IFACE (object)->get_vconsole_keymap_toggle (object);
 }
 
 /**
- * locale1_dup_x11_options: (skip)
- * @object: A #Locale1.
+ * localed_locale1_dup_vconsole_keymap_toggle: (skip)
+ * @object: A #localedLocale1.
  *
- * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.X11Options">"X11Options"</link> D-Bus property.
+ * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymapToggle">"VConsoleKeymapToggle"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-locale1_dup_x11_options (Locale1 *object)
+localed_locale1_dup_vconsole_keymap_toggle (localedLocale1 *object)
 {
   gchar *value;
-  g_object_get (G_OBJECT (object), "x11-options", &value, NULL);
+  g_object_get (G_OBJECT (object), "vconsole-keymap-toggle", &value, NULL);
   return value;
 }
 
 /**
- * locale1_set_x11_options: (skip)
- * @object: A #Locale1.
+ * localed_locale1_set_vconsole_keymap_toggle: (skip)
+ * @object: A #localedLocale1.
  * @value: The value to set.
  *
- * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.X11Options">"X11Options"</link> D-Bus property to @value.
+ * Sets the <link linkend="gdbus-property-org-freedesktop-locale1.VConsoleKeymapToggle">"VConsoleKeymapToggle"</link> D-Bus property to @value.
  *
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-locale1_set_x11_options (Locale1 *object, const gchar *value)
+localed_locale1_set_vconsole_keymap_toggle (localedLocale1 *object, const gchar *value)
 {
-  g_object_set (G_OBJECT (object), "x11-options", value, NULL);
+  g_object_set (G_OBJECT (object), "vconsole-keymap-toggle", value, NULL);
 }
 
 /**
- * locale1_call_set_locale:
- * @proxy: A #Locale1Proxy.
- * @arg_locale: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * localed_locale1_call_set_locale:
+ * @proxy: A #localedLocale1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-locale1.SetLocale">SetLocale()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call locale1_call_set_locale_finish() to get the result of the operation.
+ * You can then call localed_locale1_call_set_locale_finish() to get the result of the operation.
  *
- * See locale1_call_set_locale_sync() for the synchronous, blocking version of this method.
+ * See localed_locale1_call_set_locale_sync() for the synchronous, blocking version of this method.
  */
 void
-locale1_call_set_locale (
-    Locale1 *proxy,
-    const gchar *const *arg_locale,
-    gboolean arg_user_interaction,
+localed_locale1_call_set_locale (
+    localedLocale1 *proxy,
+    const gchar *const *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -1082,8 +1082,8 @@ locale1_call_set_locale (
   g_dbus_proxy_call (G_DBUS_PROXY (proxy),
     "SetLocale",
     g_variant_new ("(^asb)",
-                   arg_locale,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -1092,18 +1092,18 @@ locale1_call_set_locale (
 }
 
 /**
- * locale1_call_set_locale_finish:
- * @proxy: A #Locale1Proxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to locale1_call_set_locale().
+ * localed_locale1_call_set_locale_finish:
+ * @proxy: A #localedLocale1Proxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to localed_locale1_call_set_locale().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with locale1_call_set_locale().
+ * Finishes an operation started with localed_locale1_call_set_locale().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-locale1_call_set_locale_finish (
-    Locale1 *proxy,
+localed_locale1_call_set_locale_finish (
+    localedLocale1 *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -1119,24 +1119,24 @@ _out:
 }
 
 /**
- * locale1_call_set_locale_sync:
- * @proxy: A #Locale1Proxy.
- * @arg_locale: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * localed_locale1_call_set_locale_sync:
+ * @proxy: A #localedLocale1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-locale1.SetLocale">SetLocale()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See locale1_call_set_locale() for the asynchronous version of this method.
+ * See localed_locale1_call_set_locale() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-locale1_call_set_locale_sync (
-    Locale1 *proxy,
-    const gchar *const *arg_locale,
-    gboolean arg_user_interaction,
+localed_locale1_call_set_locale_sync (
+    localedLocale1 *proxy,
+    const gchar *const *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GError **error)
 {
@@ -1144,8 +1144,8 @@ locale1_call_set_locale_sync (
   _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
     "SetLocale",
     g_variant_new ("(^asb)",
-                   arg_locale,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -1160,29 +1160,29 @@ _out:
 }
 
 /**
- * locale1_call_set_vconsole_keyboard:
- * @proxy: A #Locale1Proxy.
- * @arg_keymap: Argument to pass with the method invocation.
- * @arg_keymap_toggle: Argument to pass with the method invocation.
- * @arg_convert: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * localed_locale1_call_set_vconsole_keyboard:
+ * @proxy: A #localedLocale1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
+ * @arg_unnamed_arg2: Argument to pass with the method invocation.
+ * @arg_unnamed_arg3: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-locale1.SetVConsoleKeyboard">SetVConsoleKeyboard()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call locale1_call_set_vconsole_keyboard_finish() to get the result of the operation.
+ * You can then call localed_locale1_call_set_vconsole_keyboard_finish() to get the result of the operation.
  *
- * See locale1_call_set_vconsole_keyboard_sync() for the synchronous, blocking version of this method.
+ * See localed_locale1_call_set_vconsole_keyboard_sync() for the synchronous, blocking version of this method.
  */
 void
-locale1_call_set_vconsole_keyboard (
-    Locale1 *proxy,
-    const gchar *arg_keymap,
-    const gchar *arg_keymap_toggle,
-    gboolean arg_convert,
-    gboolean arg_user_interaction,
+localed_locale1_call_set_vconsole_keyboard (
+    localedLocale1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
+    gboolean arg_unnamed_arg3,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -1190,10 +1190,10 @@ locale1_call_set_vconsole_keyboard (
   g_dbus_proxy_call (G_DBUS_PROXY (proxy),
     "SetVConsoleKeyboard",
     g_variant_new ("(ssbb)",
-                   arg_keymap,
-                   arg_keymap_toggle,
-                   arg_convert,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1,
+                   arg_unnamed_arg2,
+                   arg_unnamed_arg3),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -1202,18 +1202,18 @@ locale1_call_set_vconsole_keyboard (
 }
 
 /**
- * locale1_call_set_vconsole_keyboard_finish:
- * @proxy: A #Locale1Proxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to locale1_call_set_vconsole_keyboard().
+ * localed_locale1_call_set_vconsole_keyboard_finish:
+ * @proxy: A #localedLocale1Proxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to localed_locale1_call_set_vconsole_keyboard().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with locale1_call_set_vconsole_keyboard().
+ * Finishes an operation started with localed_locale1_call_set_vconsole_keyboard().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-locale1_call_set_vconsole_keyboard_finish (
-    Locale1 *proxy,
+localed_locale1_call_set_vconsole_keyboard_finish (
+    localedLocale1 *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -1229,28 +1229,28 @@ _out:
 }
 
 /**
- * locale1_call_set_vconsole_keyboard_sync:
- * @proxy: A #Locale1Proxy.
- * @arg_keymap: Argument to pass with the method invocation.
- * @arg_keymap_toggle: Argument to pass with the method invocation.
- * @arg_convert: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * localed_locale1_call_set_vconsole_keyboard_sync:
+ * @proxy: A #localedLocale1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
+ * @arg_unnamed_arg2: Argument to pass with the method invocation.
+ * @arg_unnamed_arg3: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-locale1.SetVConsoleKeyboard">SetVConsoleKeyboard()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See locale1_call_set_vconsole_keyboard() for the asynchronous version of this method.
+ * See localed_locale1_call_set_vconsole_keyboard() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-locale1_call_set_vconsole_keyboard_sync (
-    Locale1 *proxy,
-    const gchar *arg_keymap,
-    const gchar *arg_keymap_toggle,
-    gboolean arg_convert,
-    gboolean arg_user_interaction,
+localed_locale1_call_set_vconsole_keyboard_sync (
+    localedLocale1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
+    gboolean arg_unnamed_arg3,
     GCancellable *cancellable,
     GError **error)
 {
@@ -1258,10 +1258,10 @@ locale1_call_set_vconsole_keyboard_sync (
   _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
     "SetVConsoleKeyboard",
     g_variant_new ("(ssbb)",
-                   arg_keymap,
-                   arg_keymap_toggle,
-                   arg_convert,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1,
+                   arg_unnamed_arg2,
+                   arg_unnamed_arg3),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -1276,33 +1276,33 @@ _out:
 }
 
 /**
- * locale1_call_set_x11_keyboard:
- * @proxy: A #Locale1Proxy.
- * @arg_layout: Argument to pass with the method invocation.
- * @arg_model: Argument to pass with the method invocation.
- * @arg_variant: Argument to pass with the method invocation.
- * @arg_options: Argument to pass with the method invocation.
- * @arg_convert: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * localed_locale1_call_set_x11_keyboard:
+ * @proxy: A #localedLocale1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
+ * @arg_unnamed_arg2: Argument to pass with the method invocation.
+ * @arg_unnamed_arg3: Argument to pass with the method invocation.
+ * @arg_unnamed_arg4: Argument to pass with the method invocation.
+ * @arg_unnamed_arg5: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-locale1.SetX11Keyboard">SetX11Keyboard()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call locale1_call_set_x11_keyboard_finish() to get the result of the operation.
+ * You can then call localed_locale1_call_set_x11_keyboard_finish() to get the result of the operation.
  *
- * See locale1_call_set_x11_keyboard_sync() for the synchronous, blocking version of this method.
+ * See localed_locale1_call_set_x11_keyboard_sync() for the synchronous, blocking version of this method.
  */
 void
-locale1_call_set_x11_keyboard (
-    Locale1 *proxy,
-    const gchar *arg_layout,
-    const gchar *arg_model,
-    const gchar *arg_variant,
-    const gchar *arg_options,
-    gboolean arg_convert,
-    gboolean arg_user_interaction,
+localed_locale1_call_set_x11_keyboard (
+    localedLocale1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    const gchar *arg_unnamed_arg2,
+    const gchar *arg_unnamed_arg3,
+    gboolean arg_unnamed_arg4,
+    gboolean arg_unnamed_arg5,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -1310,12 +1310,12 @@ locale1_call_set_x11_keyboard (
   g_dbus_proxy_call (G_DBUS_PROXY (proxy),
     "SetX11Keyboard",
     g_variant_new ("(ssssbb)",
-                   arg_layout,
-                   arg_model,
-                   arg_variant,
-                   arg_options,
-                   arg_convert,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1,
+                   arg_unnamed_arg2,
+                   arg_unnamed_arg3,
+                   arg_unnamed_arg4,
+                   arg_unnamed_arg5),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -1324,18 +1324,18 @@ locale1_call_set_x11_keyboard (
 }
 
 /**
- * locale1_call_set_x11_keyboard_finish:
- * @proxy: A #Locale1Proxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to locale1_call_set_x11_keyboard().
+ * localed_locale1_call_set_x11_keyboard_finish:
+ * @proxy: A #localedLocale1Proxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to localed_locale1_call_set_x11_keyboard().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with locale1_call_set_x11_keyboard().
+ * Finishes an operation started with localed_locale1_call_set_x11_keyboard().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-locale1_call_set_x11_keyboard_finish (
-    Locale1 *proxy,
+localed_locale1_call_set_x11_keyboard_finish (
+    localedLocale1 *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -1351,32 +1351,32 @@ _out:
 }
 
 /**
- * locale1_call_set_x11_keyboard_sync:
- * @proxy: A #Locale1Proxy.
- * @arg_layout: Argument to pass with the method invocation.
- * @arg_model: Argument to pass with the method invocation.
- * @arg_variant: Argument to pass with the method invocation.
- * @arg_options: Argument to pass with the method invocation.
- * @arg_convert: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * localed_locale1_call_set_x11_keyboard_sync:
+ * @proxy: A #localedLocale1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
+ * @arg_unnamed_arg2: Argument to pass with the method invocation.
+ * @arg_unnamed_arg3: Argument to pass with the method invocation.
+ * @arg_unnamed_arg4: Argument to pass with the method invocation.
+ * @arg_unnamed_arg5: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-locale1.SetX11Keyboard">SetX11Keyboard()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See locale1_call_set_x11_keyboard() for the asynchronous version of this method.
+ * See localed_locale1_call_set_x11_keyboard() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-locale1_call_set_x11_keyboard_sync (
-    Locale1 *proxy,
-    const gchar *arg_layout,
-    const gchar *arg_model,
-    const gchar *arg_variant,
-    const gchar *arg_options,
-    gboolean arg_convert,
-    gboolean arg_user_interaction,
+localed_locale1_call_set_x11_keyboard_sync (
+    localedLocale1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    const gchar *arg_unnamed_arg2,
+    const gchar *arg_unnamed_arg3,
+    gboolean arg_unnamed_arg4,
+    gboolean arg_unnamed_arg5,
     GCancellable *cancellable,
     GError **error)
 {
@@ -1384,12 +1384,12 @@ locale1_call_set_x11_keyboard_sync (
   _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
     "SetX11Keyboard",
     g_variant_new ("(ssssbb)",
-                   arg_layout,
-                   arg_model,
-                   arg_variant,
-                   arg_options,
-                   arg_convert,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1,
+                   arg_unnamed_arg2,
+                   arg_unnamed_arg3,
+                   arg_unnamed_arg4,
+                   arg_unnamed_arg5),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -1404,8 +1404,8 @@ _out:
 }
 
 /**
- * locale1_complete_set_locale:
- * @object: A #Locale1.
+ * localed_locale1_complete_set_locale:
+ * @object: A #localedLocale1.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-locale1.SetLocale">SetLocale()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -1413,8 +1413,8 @@ _out:
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-locale1_complete_set_locale (
-    Locale1 *object,
+localed_locale1_complete_set_locale (
+    localedLocale1 *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -1422,8 +1422,8 @@ locale1_complete_set_locale (
 }
 
 /**
- * locale1_complete_set_vconsole_keyboard:
- * @object: A #Locale1.
+ * localed_locale1_complete_set_vconsole_keyboard:
+ * @object: A #localedLocale1.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-locale1.SetVConsoleKeyboard">SetVConsoleKeyboard()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -1431,8 +1431,8 @@ locale1_complete_set_locale (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-locale1_complete_set_vconsole_keyboard (
-    Locale1 *object,
+localed_locale1_complete_set_vconsole_keyboard (
+    localedLocale1 *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -1440,8 +1440,8 @@ locale1_complete_set_vconsole_keyboard (
 }
 
 /**
- * locale1_complete_set_x11_keyboard:
- * @object: A #Locale1.
+ * localed_locale1_complete_set_x11_keyboard:
+ * @object: A #localedLocale1.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-locale1.SetX11Keyboard">SetX11Keyboard()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -1449,8 +1449,8 @@ locale1_complete_set_vconsole_keyboard (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-locale1_complete_set_x11_keyboard (
-    Locale1 *object,
+localed_locale1_complete_set_x11_keyboard (
+    localedLocale1 *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -1460,45 +1460,45 @@ locale1_complete_set_x11_keyboard (
 /* ------------------------------------------------------------------------ */
 
 /**
- * Locale1Proxy:
+ * localedLocale1Proxy:
  *
- * The #Locale1Proxy structure contains only private data and should only be accessed using the provided API.
+ * The #localedLocale1Proxy structure contains only private data and should only be accessed using the provided API.
  */
 
 /**
- * Locale1ProxyClass:
+ * localedLocale1ProxyClass:
  * @parent_class: The parent class.
  *
- * Class structure for #Locale1Proxy.
+ * Class structure for #localedLocale1Proxy.
  */
 
-struct _Locale1ProxyPrivate
+struct _localedLocale1ProxyPrivate
 {
   GData *qdata;
 };
 
-static void locale1_proxy_iface_init (Locale1Iface *iface);
+static void localed_locale1_proxy_iface_init (localedLocale1Iface *iface);
 
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (Locale1Proxy, locale1_proxy, G_TYPE_DBUS_PROXY,
-                         G_ADD_PRIVATE (Locale1Proxy)
-                         G_IMPLEMENT_INTERFACE (TYPE_LOCALE1, locale1_proxy_iface_init));
+G_DEFINE_TYPE_WITH_CODE (localedLocale1Proxy, localed_locale1_proxy, G_TYPE_DBUS_PROXY,
+                         G_ADD_PRIVATE (localedLocale1Proxy)
+                         G_IMPLEMENT_INTERFACE (LOCALED_TYPE_LOCALE1, localed_locale1_proxy_iface_init));
 
 #else
-G_DEFINE_TYPE_WITH_CODE (Locale1Proxy, locale1_proxy, G_TYPE_DBUS_PROXY,
-                         G_IMPLEMENT_INTERFACE (TYPE_LOCALE1, locale1_proxy_iface_init));
+G_DEFINE_TYPE_WITH_CODE (localedLocale1Proxy, localed_locale1_proxy, G_TYPE_DBUS_PROXY,
+                         G_IMPLEMENT_INTERFACE (LOCALED_TYPE_LOCALE1, localed_locale1_proxy_iface_init));
 
 #endif
 static void
-locale1_proxy_finalize (GObject *object)
+localed_locale1_proxy_finalize (GObject *object)
 {
-  Locale1Proxy *proxy = LOCALE1_PROXY (object);
+  localedLocale1Proxy *proxy = LOCALED_LOCALE1_PROXY (object);
   g_datalist_clear (&proxy->priv->qdata);
-  G_OBJECT_CLASS (locale1_proxy_parent_class)->finalize (object);
+  G_OBJECT_CLASS (localed_locale1_proxy_parent_class)->finalize (object);
 }
 
 static void
-locale1_proxy_get_property (GObject      *object,
+localed_locale1_proxy_get_property (GObject      *object,
   guint         prop_id,
   GValue       *value,
   GParamSpec   *pspec G_GNUC_UNUSED)
@@ -1506,7 +1506,7 @@ locale1_proxy_get_property (GObject      *object,
   const _ExtendedGDBusPropertyInfo *info;
   GVariant *variant;
   g_assert (prop_id != 0 && prop_id - 1 < 7);
-  info = _locale1_property_info_pointers[prop_id - 1];
+  info = _localed_locale1_property_info_pointers[prop_id - 1];
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);
   if (info->use_gvariant)
     {
@@ -1522,7 +1522,7 @@ locale1_proxy_get_property (GObject      *object,
 }
 
 static void
-locale1_proxy_set_property_cb (GDBusProxy *proxy,
+localed_locale1_proxy_set_property_cb (GDBusProxy *proxy,
   GAsyncResult *res,
   gpointer      user_data)
 {
@@ -1545,7 +1545,7 @@ locale1_proxy_set_property_cb (GDBusProxy *proxy,
 }
 
 static void
-locale1_proxy_set_property (GObject      *object,
+localed_locale1_proxy_set_property (GObject      *object,
   guint         prop_id,
   const GValue *value,
   GParamSpec   *pspec G_GNUC_UNUSED)
@@ -1553,19 +1553,19 @@ locale1_proxy_set_property (GObject      *object,
   const _ExtendedGDBusPropertyInfo *info;
   GVariant *variant;
   g_assert (prop_id != 0 && prop_id - 1 < 7);
-  info = _locale1_property_info_pointers[prop_id - 1];
+  info = _localed_locale1_property_info_pointers[prop_id - 1];
   variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));
   g_dbus_proxy_call (G_DBUS_PROXY (object),
     "org.freedesktop.DBus.Properties.Set",
     g_variant_new ("(ssv)", "org.freedesktop.locale1", info->parent_struct.name, variant),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
-    NULL, (GAsyncReadyCallback) locale1_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
+    NULL, (GAsyncReadyCallback) localed_locale1_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
   g_variant_unref (variant);
 }
 
 static void
-locale1_proxy_g_signal (GDBusProxy *proxy,
+localed_locale1_proxy_g_signal (GDBusProxy *proxy,
   const gchar *sender_name G_GNUC_UNUSED,
   const gchar *signal_name,
   GVariant *parameters)
@@ -1577,12 +1577,12 @@ locale1_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_locale1_interface_info.parent_struct, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_localed_locale1_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
   paramv = g_new0 (GValue, num_params + 1);
-  g_value_init (&paramv[0], TYPE_LOCALE1);
+  g_value_init (&paramv[0], LOCALED_TYPE_LOCALE1);
   g_value_set_object (&paramv[0], proxy);
   g_variant_iter_init (&iter, parameters);
   n = 1;
@@ -1599,7 +1599,7 @@ locale1_proxy_g_signal (GDBusProxy *proxy,
         g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
       g_variant_unref (child);
     }
-  signal_id = g_signal_lookup (info->signal_name, TYPE_LOCALE1);
+  signal_id = g_signal_lookup (info->signal_name, LOCALED_TYPE_LOCALE1);
   g_signal_emitv (paramv, signal_id, 0, NULL);
   for (n = 0; n < num_params + 1; n++)
     g_value_unset (&paramv[n]);
@@ -1607,11 +1607,11 @@ locale1_proxy_g_signal (GDBusProxy *proxy,
 }
 
 static void
-locale1_proxy_g_properties_changed (GDBusProxy *_proxy,
+localed_locale1_proxy_g_properties_changed (GDBusProxy *_proxy,
   GVariant *changed_properties,
   const gchar *const *invalidated_properties)
 {
-  Locale1Proxy *proxy = LOCALE1_PROXY (_proxy);
+  localedLocale1Proxy *proxy = LOCALED_LOCALE1_PROXY (_proxy);
   guint n;
   const gchar *key;
   GVariantIter *iter;
@@ -1619,7 +1619,7 @@ locale1_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_locale1_interface_info.parent_struct, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_localed_locale1_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -1627,7 +1627,7 @@ locale1_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_locale1_interface_info.parent_struct, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_localed_locale1_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -1635,9 +1635,9 @@ locale1_proxy_g_properties_changed (GDBusProxy *_proxy,
 }
 
 static const gchar *const *
-locale1_proxy_get_locale (Locale1 *object)
+localed_locale1_proxy_get_locale (localedLocale1 *object)
 {
-  Locale1Proxy *proxy = LOCALE1_PROXY (object);
+  localedLocale1Proxy *proxy = LOCALED_LOCALE1_PROXY (object);
   GVariant *variant;
   const gchar *const *value = NULL;
   value = g_datalist_get_data (&proxy->priv->qdata, "Locale");
@@ -1654,12 +1654,12 @@ locale1_proxy_get_locale (Locale1 *object)
 }
 
 static const gchar *
-locale1_proxy_get_vconsole_keymap (Locale1 *object)
+localed_locale1_proxy_get_x11_layout (localedLocale1 *object)
 {
-  Locale1Proxy *proxy = LOCALE1_PROXY (object);
+  localedLocale1Proxy *proxy = LOCALED_LOCALE1_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
-  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "VConsoleKeymap");
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "X11Layout");
   if (variant != NULL)
     {
       value = g_variant_get_string (variant, NULL);
@@ -1669,12 +1669,12 @@ locale1_proxy_get_vconsole_keymap (Locale1 *object)
 }
 
 static const gchar *
-locale1_proxy_get_vconsole_keymap_toggle (Locale1 *object)
+localed_locale1_proxy_get_x11_model (localedLocale1 *object)
 {
-  Locale1Proxy *proxy = LOCALE1_PROXY (object);
+  localedLocale1Proxy *proxy = LOCALED_LOCALE1_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
-  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "VConsoleKeymapToggle");
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "X11Model");
   if (variant != NULL)
     {
       value = g_variant_get_string (variant, NULL);
@@ -1684,12 +1684,12 @@ locale1_proxy_get_vconsole_keymap_toggle (Locale1 *object)
 }
 
 static const gchar *
-locale1_proxy_get_x11_layout (Locale1 *object)
+localed_locale1_proxy_get_x11_variant (localedLocale1 *object)
 {
-  Locale1Proxy *proxy = LOCALE1_PROXY (object);
+  localedLocale1Proxy *proxy = LOCALED_LOCALE1_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
-  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "X11Layout");
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "X11Variant");
   if (variant != NULL)
     {
       value = g_variant_get_string (variant, NULL);
@@ -1699,12 +1699,12 @@ locale1_proxy_get_x11_layout (Locale1 *object)
 }
 
 static const gchar *
-locale1_proxy_get_x11_model (Locale1 *object)
+localed_locale1_proxy_get_x11_options (localedLocale1 *object)
 {
-  Locale1Proxy *proxy = LOCALE1_PROXY (object);
+  localedLocale1Proxy *proxy = LOCALED_LOCALE1_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
-  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "X11Model");
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "X11Options");
   if (variant != NULL)
     {
       value = g_variant_get_string (variant, NULL);
@@ -1714,12 +1714,12 @@ locale1_proxy_get_x11_model (Locale1 *object)
 }
 
 static const gchar *
-locale1_proxy_get_x11_variant (Locale1 *object)
+localed_locale1_proxy_get_vconsole_keymap (localedLocale1 *object)
 {
-  Locale1Proxy *proxy = LOCALE1_PROXY (object);
+  localedLocale1Proxy *proxy = LOCALED_LOCALE1_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
-  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "X11Variant");
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "VConsoleKeymap");
   if (variant != NULL)
     {
       value = g_variant_get_string (variant, NULL);
@@ -1729,12 +1729,12 @@ locale1_proxy_get_x11_variant (Locale1 *object)
 }
 
 static const gchar *
-locale1_proxy_get_x11_options (Locale1 *object)
+localed_locale1_proxy_get_vconsole_keymap_toggle (localedLocale1 *object)
 {
-  Locale1Proxy *proxy = LOCALE1_PROXY (object);
+  localedLocale1Proxy *proxy = LOCALED_LOCALE1_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
-  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "X11Options");
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "VConsoleKeymapToggle");
   if (variant != NULL)
     {
       value = g_variant_get_string (variant, NULL);
@@ -1744,53 +1744,53 @@ locale1_proxy_get_x11_options (Locale1 *object)
 }
 
 static void
-locale1_proxy_init (Locale1Proxy *proxy)
+localed_locale1_proxy_init (localedLocale1Proxy *proxy)
 {
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  proxy->priv = locale1_proxy_get_instance_private (proxy);
+  proxy->priv = localed_locale1_proxy_get_instance_private (proxy);
 #else
-  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TYPE_LOCALE1_PROXY, Locale1ProxyPrivate);
+  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, LOCALED_TYPE_LOCALE1_PROXY, localedLocale1ProxyPrivate);
 #endif
 
-  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), locale1_interface_info ());
+  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), localed_locale1_interface_info ());
 }
 
 static void
-locale1_proxy_class_init (Locale1ProxyClass *klass)
+localed_locale1_proxy_class_init (localedLocale1ProxyClass *klass)
 {
   GObjectClass *gobject_class;
   GDBusProxyClass *proxy_class;
 
   gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize     = locale1_proxy_finalize;
-  gobject_class->get_property = locale1_proxy_get_property;
-  gobject_class->set_property = locale1_proxy_set_property;
+  gobject_class->finalize     = localed_locale1_proxy_finalize;
+  gobject_class->get_property = localed_locale1_proxy_get_property;
+  gobject_class->set_property = localed_locale1_proxy_set_property;
 
   proxy_class = G_DBUS_PROXY_CLASS (klass);
-  proxy_class->g_signal = locale1_proxy_g_signal;
-  proxy_class->g_properties_changed = locale1_proxy_g_properties_changed;
+  proxy_class->g_signal = localed_locale1_proxy_g_signal;
+  proxy_class->g_properties_changed = localed_locale1_proxy_g_properties_changed;
 
-  locale1_override_properties (gobject_class, 1);
+  localed_locale1_override_properties (gobject_class, 1);
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (Locale1ProxyPrivate));
+  g_type_class_add_private (klass, sizeof (localedLocale1ProxyPrivate));
 #endif
 }
 
 static void
-locale1_proxy_iface_init (Locale1Iface *iface)
+localed_locale1_proxy_iface_init (localedLocale1Iface *iface)
 {
-  iface->get_locale = locale1_proxy_get_locale;
-  iface->get_vconsole_keymap = locale1_proxy_get_vconsole_keymap;
-  iface->get_vconsole_keymap_toggle = locale1_proxy_get_vconsole_keymap_toggle;
-  iface->get_x11_layout = locale1_proxy_get_x11_layout;
-  iface->get_x11_model = locale1_proxy_get_x11_model;
-  iface->get_x11_variant = locale1_proxy_get_x11_variant;
-  iface->get_x11_options = locale1_proxy_get_x11_options;
+  iface->get_locale = localed_locale1_proxy_get_locale;
+  iface->get_x11_layout = localed_locale1_proxy_get_x11_layout;
+  iface->get_x11_model = localed_locale1_proxy_get_x11_model;
+  iface->get_x11_variant = localed_locale1_proxy_get_x11_variant;
+  iface->get_x11_options = localed_locale1_proxy_get_x11_options;
+  iface->get_vconsole_keymap = localed_locale1_proxy_get_vconsole_keymap;
+  iface->get_vconsole_keymap_toggle = localed_locale1_proxy_get_vconsole_keymap_toggle;
 }
 
 /**
- * locale1_proxy_new:
+ * localed_locale1_proxy_new:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
@@ -1802,12 +1802,12 @@ locale1_proxy_iface_init (Locale1Iface *iface)
  * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-locale1.top_of_page">org.freedesktop.locale1</link>. See g_dbus_proxy_new() for more details.
  *
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call locale1_proxy_new_finish() to get the result of the operation.
+ * You can then call localed_locale1_proxy_new_finish() to get the result of the operation.
  *
- * See locale1_proxy_new_sync() for the synchronous, blocking version of this constructor.
+ * See localed_locale1_proxy_new_sync() for the synchronous, blocking version of this constructor.
  */
 void
-locale1_proxy_new (
+localed_locale1_proxy_new (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1816,20 +1816,20 @@ locale1_proxy_new (
     GAsyncReadyCallback  callback,
     gpointer             user_data)
 {
-  g_async_initable_new_async (TYPE_LOCALE1_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.locale1", NULL);
+  g_async_initable_new_async (LOCALED_TYPE_LOCALE1_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.locale1", NULL);
 }
 
 /**
- * locale1_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to locale1_proxy_new().
+ * localed_locale1_proxy_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to localed_locale1_proxy_new().
  * @error: Return location for error or %NULL
  *
- * Finishes an operation started with locale1_proxy_new().
+ * Finishes an operation started with localed_locale1_proxy_new().
  *
- * Returns: (transfer full) (type Locale1Proxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type localedLocale1Proxy): The constructed proxy object or %NULL if @error is set.
  */
-Locale1 *
-locale1_proxy_new_finish (
+localedLocale1 *
+localed_locale1_proxy_new_finish (
     GAsyncResult        *res,
     GError             **error)
 {
@@ -1839,13 +1839,13 @@ locale1_proxy_new_finish (
   ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
   g_object_unref (source_object);
   if (ret != NULL)
-    return LOCALE1 (ret);
+    return LOCALED_LOCALE1 (ret);
   else
     return NULL;
 }
 
 /**
- * locale1_proxy_new_sync:
+ * localed_locale1_proxy_new_sync:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
@@ -1857,12 +1857,12 @@ locale1_proxy_new_finish (
  *
  * The calling thread is blocked until a reply is received.
  *
- * See locale1_proxy_new() for the asynchronous version of this constructor.
+ * See localed_locale1_proxy_new() for the asynchronous version of this constructor.
  *
- * Returns: (transfer full) (type Locale1Proxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type localedLocale1Proxy): The constructed proxy object or %NULL if @error is set.
  */
-Locale1 *
-locale1_proxy_new_sync (
+localedLocale1 *
+localed_locale1_proxy_new_sync (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1871,16 +1871,16 @@ locale1_proxy_new_sync (
     GError             **error)
 {
   GInitable *ret;
-  ret = g_initable_new (TYPE_LOCALE1_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.locale1", NULL);
+  ret = g_initable_new (LOCALED_TYPE_LOCALE1_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.locale1", NULL);
   if (ret != NULL)
-    return LOCALE1 (ret);
+    return LOCALED_LOCALE1 (ret);
   else
     return NULL;
 }
 
 
 /**
- * locale1_proxy_new_for_bus:
+ * localed_locale1_proxy_new_for_bus:
  * @bus_type: A #GBusType.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: A bus name (well-known or unique).
@@ -1889,15 +1889,15 @@ locale1_proxy_new_sync (
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
  * @user_data: User data to pass to @callback.
  *
- * Like locale1_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
+ * Like localed_locale1_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
  *
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call locale1_proxy_new_for_bus_finish() to get the result of the operation.
+ * You can then call localed_locale1_proxy_new_for_bus_finish() to get the result of the operation.
  *
- * See locale1_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
+ * See localed_locale1_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
  */
 void
-locale1_proxy_new_for_bus (
+localed_locale1_proxy_new_for_bus (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1906,20 +1906,20 @@ locale1_proxy_new_for_bus (
     GAsyncReadyCallback  callback,
     gpointer             user_data)
 {
-  g_async_initable_new_async (TYPE_LOCALE1_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.locale1", NULL);
+  g_async_initable_new_async (LOCALED_TYPE_LOCALE1_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.locale1", NULL);
 }
 
 /**
- * locale1_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to locale1_proxy_new_for_bus().
+ * localed_locale1_proxy_new_for_bus_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to localed_locale1_proxy_new_for_bus().
  * @error: Return location for error or %NULL
  *
- * Finishes an operation started with locale1_proxy_new_for_bus().
+ * Finishes an operation started with localed_locale1_proxy_new_for_bus().
  *
- * Returns: (transfer full) (type Locale1Proxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type localedLocale1Proxy): The constructed proxy object or %NULL if @error is set.
  */
-Locale1 *
-locale1_proxy_new_for_bus_finish (
+localedLocale1 *
+localed_locale1_proxy_new_for_bus_finish (
     GAsyncResult        *res,
     GError             **error)
 {
@@ -1929,13 +1929,13 @@ locale1_proxy_new_for_bus_finish (
   ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
   g_object_unref (source_object);
   if (ret != NULL)
-    return LOCALE1 (ret);
+    return LOCALED_LOCALE1 (ret);
   else
     return NULL;
 }
 
 /**
- * locale1_proxy_new_for_bus_sync:
+ * localed_locale1_proxy_new_for_bus_sync:
  * @bus_type: A #GBusType.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: A bus name (well-known or unique).
@@ -1943,16 +1943,16 @@ locale1_proxy_new_for_bus_finish (
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL
  *
- * Like locale1_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
+ * Like localed_locale1_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
  *
  * The calling thread is blocked until a reply is received.
  *
- * See locale1_proxy_new_for_bus() for the asynchronous version of this constructor.
+ * See localed_locale1_proxy_new_for_bus() for the asynchronous version of this constructor.
  *
- * Returns: (transfer full) (type Locale1Proxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type localedLocale1Proxy): The constructed proxy object or %NULL if @error is set.
  */
-Locale1 *
-locale1_proxy_new_for_bus_sync (
+localedLocale1 *
+localed_locale1_proxy_new_for_bus_sync (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1961,9 +1961,9 @@ locale1_proxy_new_for_bus_sync (
     GError             **error)
 {
   GInitable *ret;
-  ret = g_initable_new (TYPE_LOCALE1_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.locale1", NULL);
+  ret = g_initable_new (LOCALED_TYPE_LOCALE1_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.locale1", NULL);
   if (ret != NULL)
-    return LOCALE1 (ret);
+    return LOCALED_LOCALE1 (ret);
   else
     return NULL;
 }
@@ -1972,19 +1972,19 @@ locale1_proxy_new_for_bus_sync (
 /* ------------------------------------------------------------------------ */
 
 /**
- * Locale1Skeleton:
+ * localedLocale1Skeleton:
  *
- * The #Locale1Skeleton structure contains only private data and should only be accessed using the provided API.
+ * The #localedLocale1Skeleton structure contains only private data and should only be accessed using the provided API.
  */
 
 /**
- * Locale1SkeletonClass:
+ * localedLocale1SkeletonClass:
  * @parent_class: The parent class.
  *
- * Class structure for #Locale1Skeleton.
+ * Class structure for #localedLocale1Skeleton.
  */
 
-struct _Locale1SkeletonPrivate
+struct _localedLocale1SkeletonPrivate
 {
   GValue *properties;
   GList *changed_properties;
@@ -1994,7 +1994,7 @@ struct _Locale1SkeletonPrivate
 };
 
 static void
-_locale1_skeleton_handle_method_call (
+_localed_locale1_skeleton_handle_method_call (
   GDBusConnection *connection G_GNUC_UNUSED,
   const gchar *sender G_GNUC_UNUSED,
   const gchar *object_path G_GNUC_UNUSED,
@@ -2004,7 +2004,7 @@ _locale1_skeleton_handle_method_call (
   GDBusMethodInvocation *invocation,
   gpointer user_data)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (user_data);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (user_data);
   _ExtendedGDBusMethodInfo *info;
   GVariantIter iter;
   GVariant *child;
@@ -2019,7 +2019,7 @@ _locale1_skeleton_handle_method_call (
   num_params = g_variant_n_children (parameters);
   num_extra = info->pass_fdlist ? 3 : 2;  paramv = g_new0 (GValue, num_params + num_extra);
   n = 0;
-  g_value_init (&paramv[n], TYPE_LOCALE1);
+  g_value_init (&paramv[n], LOCALED_TYPE_LOCALE1);
   g_value_set_object (&paramv[n++], skeleton);
   g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
   g_value_set_object (&paramv[n++], invocation);
@@ -2046,7 +2046,7 @@ _locale1_skeleton_handle_method_call (
         g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
       g_variant_unref (child);
     }
-  signal_id = g_signal_lookup (info->signal_name, TYPE_LOCALE1);
+  signal_id = g_signal_lookup (info->signal_name, LOCALED_TYPE_LOCALE1);
   g_value_init (&return_value, G_TYPE_BOOLEAN);
   g_signal_emitv (paramv, signal_id, 0, &return_value);
   if (!g_value_get_boolean (&return_value))
@@ -2058,7 +2058,7 @@ _locale1_skeleton_handle_method_call (
 }
 
 static GVariant *
-_locale1_skeleton_handle_get_property (
+_localed_locale1_skeleton_handle_get_property (
   GDBusConnection *connection G_GNUC_UNUSED,
   const gchar *sender G_GNUC_UNUSED,
   const gchar *object_path G_GNUC_UNUSED,
@@ -2067,13 +2067,13 @@ _locale1_skeleton_handle_get_property (
   GError **error,
   gpointer user_data)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (user_data);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (user_data);
   GValue value = G_VALUE_INIT;
   GParamSpec *pspec;
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_locale1_interface_info.parent_struct, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_localed_locale1_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -2091,7 +2091,7 @@ _locale1_skeleton_handle_get_property (
 }
 
 static gboolean
-_locale1_skeleton_handle_set_property (
+_localed_locale1_skeleton_handle_set_property (
   GDBusConnection *connection G_GNUC_UNUSED,
   const gchar *sender G_GNUC_UNUSED,
   const gchar *object_path G_GNUC_UNUSED,
@@ -2101,13 +2101,13 @@ _locale1_skeleton_handle_set_property (
   GError **error,
   gpointer user_data)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (user_data);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (user_data);
   GValue value = G_VALUE_INIT;
   GParamSpec *pspec;
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_locale1_interface_info.parent_struct, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_localed_locale1_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -2127,43 +2127,43 @@ _locale1_skeleton_handle_set_property (
   return ret;
 }
 
-static const GDBusInterfaceVTable _locale1_skeleton_vtable =
+static const GDBusInterfaceVTable _localed_locale1_skeleton_vtable =
 {
-  _locale1_skeleton_handle_method_call,
-  _locale1_skeleton_handle_get_property,
-  _locale1_skeleton_handle_set_property,
+  _localed_locale1_skeleton_handle_method_call,
+  _localed_locale1_skeleton_handle_get_property,
+  _localed_locale1_skeleton_handle_set_property,
   {NULL}
 };
 
 static GDBusInterfaceInfo *
-locale1_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
+localed_locale1_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
 {
-  return locale1_interface_info ();
+  return localed_locale1_interface_info ();
 }
 
 static GDBusInterfaceVTable *
-locale1_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
+localed_locale1_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
 {
-  return (GDBusInterfaceVTable *) &_locale1_skeleton_vtable;
+  return (GDBusInterfaceVTable *) &_localed_locale1_skeleton_vtable;
 }
 
 static GVariant *
-locale1_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
+localed_locale1_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (_skeleton);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (_skeleton);
 
   GVariantBuilder builder;
   guint n;
   g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
-  if (_locale1_interface_info.parent_struct.properties == NULL)
+  if (_localed_locale1_interface_info.parent_struct.properties == NULL)
     goto out;
-  for (n = 0; _locale1_interface_info.parent_struct.properties[n] != NULL; n++)
+  for (n = 0; _localed_locale1_interface_info.parent_struct.properties[n] != NULL; n++)
     {
-      GDBusPropertyInfo *info = _locale1_interface_info.parent_struct.properties[n];
+      GDBusPropertyInfo *info = _localed_locale1_interface_info.parent_struct.properties[n];
       if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
         {
           GVariant *value;
-          value = _locale1_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.locale1", info->name, NULL, skeleton);
+          value = _localed_locale1_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.locale1", info->name, NULL, skeleton);
           if (value != NULL)
             {
               g_variant_take_ref (value);
@@ -2176,12 +2176,12 @@ out:
   return g_variant_builder_end (&builder);
 }
 
-static gboolean _locale1_emit_changed (gpointer user_data);
+static gboolean _localed_locale1_emit_changed (gpointer user_data);
 
 static void
-locale1_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
+localed_locale1_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (_skeleton);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (_skeleton);
   gboolean emit_changed = FALSE;
 
   g_mutex_lock (&skeleton->priv->lock);
@@ -2194,24 +2194,24 @@ locale1_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
   g_mutex_unlock (&skeleton->priv->lock);
 
   if (emit_changed)
-    _locale1_emit_changed (skeleton);
+    _localed_locale1_emit_changed (skeleton);
 }
 
-static void locale1_skeleton_iface_init (Locale1Iface *iface);
+static void localed_locale1_skeleton_iface_init (localedLocale1Iface *iface);
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (Locale1Skeleton, locale1_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_ADD_PRIVATE (Locale1Skeleton)
-                         G_IMPLEMENT_INTERFACE (TYPE_LOCALE1, locale1_skeleton_iface_init));
+G_DEFINE_TYPE_WITH_CODE (localedLocale1Skeleton, localed_locale1_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+                         G_ADD_PRIVATE (localedLocale1Skeleton)
+                         G_IMPLEMENT_INTERFACE (LOCALED_TYPE_LOCALE1, localed_locale1_skeleton_iface_init));
 
 #else
-G_DEFINE_TYPE_WITH_CODE (Locale1Skeleton, locale1_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_IMPLEMENT_INTERFACE (TYPE_LOCALE1, locale1_skeleton_iface_init));
+G_DEFINE_TYPE_WITH_CODE (localedLocale1Skeleton, localed_locale1_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+                         G_IMPLEMENT_INTERFACE (LOCALED_TYPE_LOCALE1, localed_locale1_skeleton_iface_init));
 
 #endif
 static void
-locale1_skeleton_finalize (GObject *object)
+localed_locale1_skeleton_finalize (GObject *object)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   guint n;
   for (n = 0; n < 7; n++)
     g_value_unset (&skeleton->priv->properties[n]);
@@ -2221,16 +2221,16 @@ locale1_skeleton_finalize (GObject *object)
     g_source_destroy (skeleton->priv->changed_properties_idle_source);
   g_main_context_unref (skeleton->priv->context);
   g_mutex_clear (&skeleton->priv->lock);
-  G_OBJECT_CLASS (locale1_skeleton_parent_class)->finalize (object);
+  G_OBJECT_CLASS (localed_locale1_skeleton_parent_class)->finalize (object);
 }
 
 static void
-locale1_skeleton_get_property (GObject      *object,
+localed_locale1_skeleton_get_property (GObject      *object,
   guint         prop_id,
   GValue       *value,
   GParamSpec   *pspec G_GNUC_UNUSED)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   g_assert (prop_id != 0 && prop_id - 1 < 7);
   g_mutex_lock (&skeleton->priv->lock);
   g_value_copy (&skeleton->priv->properties[prop_id - 1], value);
@@ -2238,9 +2238,9 @@ locale1_skeleton_get_property (GObject      *object,
 }
 
 static gboolean
-_locale1_emit_changed (gpointer user_data)
+_localed_locale1_emit_changed (gpointer user_data)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (user_data);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (user_data);
   GList *l;
   GVariantBuilder builder;
   GVariantBuilder invalidated_builder;
@@ -2298,7 +2298,7 @@ _locale1_emit_changed (gpointer user_data)
 }
 
 static void
-_locale1_schedule_emit_changed (Locale1Skeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
+_localed_locale1_schedule_emit_changed (localedLocale1Skeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
 {
   ChangedProperty *cp;
   GList *l;
@@ -2324,17 +2324,17 @@ _locale1_schedule_emit_changed (Locale1Skeleton *skeleton, const _ExtendedGDBusP
 }
 
 static void
-locale1_skeleton_notify (GObject      *object,
+localed_locale1_skeleton_notify (GObject      *object,
   GParamSpec *pspec G_GNUC_UNUSED)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   g_mutex_lock (&skeleton->priv->lock);
   if (skeleton->priv->changed_properties != NULL &&
       skeleton->priv->changed_properties_idle_source == NULL)
     {
       skeleton->priv->changed_properties_idle_source = g_idle_source_new ();
       g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);
-      g_source_set_callback (skeleton->priv->changed_properties_idle_source, _locale1_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
+      g_source_set_callback (skeleton->priv->changed_properties_idle_source, _localed_locale1_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
       g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);
       g_source_unref (skeleton->priv->changed_properties_idle_source);
     }
@@ -2342,19 +2342,19 @@ locale1_skeleton_notify (GObject      *object,
 }
 
 static void
-locale1_skeleton_set_property (GObject      *object,
+localed_locale1_skeleton_set_property (GObject      *object,
   guint         prop_id,
   const GValue *value,
   GParamSpec   *pspec)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   g_assert (prop_id != 0 && prop_id - 1 < 7);
   g_mutex_lock (&skeleton->priv->lock);
   g_object_freeze_notify (object);
   if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1]))
     {
       if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)
-        _locale1_schedule_emit_changed (skeleton, _locale1_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]);
+        _localed_locale1_schedule_emit_changed (skeleton, _localed_locale1_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]);
       g_value_copy (value, &skeleton->priv->properties[prop_id - 1]);
       g_object_notify_by_pspec (object, pspec);
     }
@@ -2363,12 +2363,12 @@ locale1_skeleton_set_property (GObject      *object,
 }
 
 static void
-locale1_skeleton_init (Locale1Skeleton *skeleton)
+localed_locale1_skeleton_init (localedLocale1Skeleton *skeleton)
 {
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  skeleton->priv = locale1_skeleton_get_instance_private (skeleton);
+  skeleton->priv = localed_locale1_skeleton_get_instance_private (skeleton);
 #else
-  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TYPE_LOCALE1_SKELETON, Locale1SkeletonPrivate);
+  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, LOCALED_TYPE_LOCALE1_SKELETON, localedLocale1SkeletonPrivate);
 #endif
 
   g_mutex_init (&skeleton->priv->lock);
@@ -2384,9 +2384,9 @@ locale1_skeleton_init (Locale1Skeleton *skeleton)
 }
 
 static const gchar *const *
-locale1_skeleton_get_locale (Locale1 *object)
+localed_locale1_skeleton_get_locale (localedLocale1 *object)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   const gchar *const *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_boxed (&(skeleton->priv->properties[0]));
@@ -2395,9 +2395,9 @@ locale1_skeleton_get_locale (Locale1 *object)
 }
 
 static const gchar *
-locale1_skeleton_get_vconsole_keymap (Locale1 *object)
+localed_locale1_skeleton_get_x11_layout (localedLocale1 *object)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[1]));
@@ -2406,9 +2406,9 @@ locale1_skeleton_get_vconsole_keymap (Locale1 *object)
 }
 
 static const gchar *
-locale1_skeleton_get_vconsole_keymap_toggle (Locale1 *object)
+localed_locale1_skeleton_get_x11_model (localedLocale1 *object)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[2]));
@@ -2417,9 +2417,9 @@ locale1_skeleton_get_vconsole_keymap_toggle (Locale1 *object)
 }
 
 static const gchar *
-locale1_skeleton_get_x11_layout (Locale1 *object)
+localed_locale1_skeleton_get_x11_variant (localedLocale1 *object)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[3]));
@@ -2428,9 +2428,9 @@ locale1_skeleton_get_x11_layout (Locale1 *object)
 }
 
 static const gchar *
-locale1_skeleton_get_x11_model (Locale1 *object)
+localed_locale1_skeleton_get_x11_options (localedLocale1 *object)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[4]));
@@ -2439,9 +2439,9 @@ locale1_skeleton_get_x11_model (Locale1 *object)
 }
 
 static const gchar *
-locale1_skeleton_get_x11_variant (Locale1 *object)
+localed_locale1_skeleton_get_vconsole_keymap (localedLocale1 *object)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[5]));
@@ -2450,9 +2450,9 @@ locale1_skeleton_get_x11_variant (Locale1 *object)
 }
 
 static const gchar *
-locale1_skeleton_get_x11_options (Locale1 *object)
+localed_locale1_skeleton_get_vconsole_keymap_toggle (localedLocale1 *object)
 {
-  Locale1Skeleton *skeleton = LOCALE1_SKELETON (object);
+  localedLocale1Skeleton *skeleton = LOCALED_LOCALE1_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[6]));
@@ -2461,53 +2461,617 @@ locale1_skeleton_get_x11_options (Locale1 *object)
 }
 
 static void
-locale1_skeleton_class_init (Locale1SkeletonClass *klass)
+localed_locale1_skeleton_class_init (localedLocale1SkeletonClass *klass)
 {
   GObjectClass *gobject_class;
   GDBusInterfaceSkeletonClass *skeleton_class;
 
   gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = locale1_skeleton_finalize;
-  gobject_class->get_property = locale1_skeleton_get_property;
-  gobject_class->set_property = locale1_skeleton_set_property;
-  gobject_class->notify       = locale1_skeleton_notify;
+  gobject_class->finalize = localed_locale1_skeleton_finalize;
+  gobject_class->get_property = localed_locale1_skeleton_get_property;
+  gobject_class->set_property = localed_locale1_skeleton_set_property;
+  gobject_class->notify       = localed_locale1_skeleton_notify;
 
 
-  locale1_override_properties (gobject_class, 1);
+  localed_locale1_override_properties (gobject_class, 1);
 
   skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
-  skeleton_class->get_info = locale1_skeleton_dbus_interface_get_info;
-  skeleton_class->get_properties = locale1_skeleton_dbus_interface_get_properties;
-  skeleton_class->flush = locale1_skeleton_dbus_interface_flush;
-  skeleton_class->get_vtable = locale1_skeleton_dbus_interface_get_vtable;
+  skeleton_class->get_info = localed_locale1_skeleton_dbus_interface_get_info;
+  skeleton_class->get_properties = localed_locale1_skeleton_dbus_interface_get_properties;
+  skeleton_class->flush = localed_locale1_skeleton_dbus_interface_flush;
+  skeleton_class->get_vtable = localed_locale1_skeleton_dbus_interface_get_vtable;
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (Locale1SkeletonPrivate));
+  g_type_class_add_private (klass, sizeof (localedLocale1SkeletonPrivate));
 #endif
 }
 
 static void
-locale1_skeleton_iface_init (Locale1Iface *iface)
+localed_locale1_skeleton_iface_init (localedLocale1Iface *iface)
 {
-  iface->get_locale = locale1_skeleton_get_locale;
-  iface->get_vconsole_keymap = locale1_skeleton_get_vconsole_keymap;
-  iface->get_vconsole_keymap_toggle = locale1_skeleton_get_vconsole_keymap_toggle;
-  iface->get_x11_layout = locale1_skeleton_get_x11_layout;
-  iface->get_x11_model = locale1_skeleton_get_x11_model;
-  iface->get_x11_variant = locale1_skeleton_get_x11_variant;
-  iface->get_x11_options = locale1_skeleton_get_x11_options;
+  iface->get_locale = localed_locale1_skeleton_get_locale;
+  iface->get_x11_layout = localed_locale1_skeleton_get_x11_layout;
+  iface->get_x11_model = localed_locale1_skeleton_get_x11_model;
+  iface->get_x11_variant = localed_locale1_skeleton_get_x11_variant;
+  iface->get_x11_options = localed_locale1_skeleton_get_x11_options;
+  iface->get_vconsole_keymap = localed_locale1_skeleton_get_vconsole_keymap;
+  iface->get_vconsole_keymap_toggle = localed_locale1_skeleton_get_vconsole_keymap_toggle;
 }
 
 /**
- * locale1_skeleton_new:
+ * localed_locale1_skeleton_new:
  *
  * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-locale1.top_of_page">org.freedesktop.locale1</link>.
  *
- * Returns: (transfer full) (type Locale1Skeleton): The skeleton object.
+ * Returns: (transfer full) (type localedLocale1Skeleton): The skeleton object.
+ */
+localedLocale1 *
+localed_locale1_skeleton_new (void)
+{
+  return LOCALED_LOCALE1 (g_object_new (LOCALED_TYPE_LOCALE1_SKELETON, NULL));
+}
+
+/* ------------------------------------------------------------------------
+ * Code for Object, ObjectProxy and ObjectSkeleton
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * SECTION:localedObject
+ * @title: localedObject
+ * @short_description: Specialized GDBusObject types
+ *
+ * This section contains the #localedObject, #localedObjectProxy, and #localedObjectSkeleton types which make it easier to work with objects implementing generated types for D-Bus interfaces.
+ */
+
+/**
+ * localedObject:
+ *
+ * The #localedObject type is a specialized container of interfaces.
+ */
+
+/**
+ * localedObjectIface:
+ * @parent_iface: The parent interface.
+ *
+ * Virtual table for the #localedObject interface.
+ */
+
+typedef localedObjectIface localedObjectInterface;
+G_DEFINE_INTERFACE_WITH_CODE (localedObject, localed_object, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));
+
+static void
+localed_object_default_init (localedObjectIface *iface)
+{
+  /**
+   * localedObject:locale1:
+   *
+   * The #localedLocale1 instance corresponding to the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-locale1.top_of_page">org.freedesktop.locale1</link>, if any.
+   *
+   * Connect to the #GObject::notify signal to get informed of property changes.
+   */
+  g_object_interface_install_property (iface, g_param_spec_object ("locale1", "locale1", "locale1", LOCALED_TYPE_LOCALE1, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));
+
+}
+
+/**
+ * localed_object_get_locale1:
+ * @object: A #localedObject.
+ *
+ * Gets the #localedLocale1 instance for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-locale1.top_of_page">org.freedesktop.locale1</link> on @object, if any.
+ *
+ * Returns: (transfer full): A #localedLocale1 that must be freed with g_object_unref() or %NULL if @object does not implement the interface.
+ */
+localedLocale1 *localed_object_get_locale1 (localedObject *object)
+{
+  GDBusInterface *ret;
+  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.locale1");
+  if (ret == NULL)
+    return NULL;
+  return LOCALED_LOCALE1 (ret);
+}
+
+
+/**
+ * localed_object_peek_locale1: (skip)
+ * @object: A #localedObject.
+ *
+ * Like localed_object_get_locale1() but doesn't increase the reference count on the returned object.
+ *
+ * <warning>It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running.</warning>
+ *
+ * Returns: (transfer none): A #localedLocale1 or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object.
+ */
+localedLocale1 *localed_object_peek_locale1 (localedObject *object)
+{
+  GDBusInterface *ret;
+  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.locale1");
+  if (ret == NULL)
+    return NULL;
+  g_object_unref (ret);
+  return LOCALED_LOCALE1 (ret);
+}
+
+
+static void
+localed_object_notify (GDBusObject *object, GDBusInterface *interface)
+{
+  _ExtendedGDBusInterfaceInfo *info = (_ExtendedGDBusInterfaceInfo *) g_dbus_interface_get_info (interface);
+  /* info can be NULL if the other end is using a D-Bus interface we don't know
+   * anything about, for example old generated code in this process talking to
+   * newer generated code in the other process. */
+  if (info != NULL)
+    g_object_notify (G_OBJECT (object), info->hyphen_name);
+}
+
+/**
+ * localedObjectProxy:
+ *
+ * The #localedObjectProxy structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * localedObjectProxyClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #localedObjectProxy.
+ */
+
+static void
+localed_object_proxy__localed_object_iface_init (localedObjectIface *iface G_GNUC_UNUSED)
+{
+}
+
+static void
+localed_object_proxy__g_dbus_object_iface_init (GDBusObjectIface *iface)
+{
+  iface->interface_added = localed_object_notify;
+  iface->interface_removed = localed_object_notify;
+}
+
+
+G_DEFINE_TYPE_WITH_CODE (localedObjectProxy, localed_object_proxy, G_TYPE_DBUS_OBJECT_PROXY,
+                         G_IMPLEMENT_INTERFACE (LOCALED_TYPE_OBJECT, localed_object_proxy__localed_object_iface_init)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, localed_object_proxy__g_dbus_object_iface_init));
+
+static void
+localed_object_proxy_init (localedObjectProxy *object G_GNUC_UNUSED)
+{
+}
+
+static void
+localed_object_proxy_set_property (GObject      *gobject,
+  guint         prop_id,
+  const GValue *value G_GNUC_UNUSED,
+  GParamSpec   *pspec)
+{
+  G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+}
+
+static void
+localed_object_proxy_get_property (GObject      *gobject,
+  guint         prop_id,
+  GValue       *value,
+  GParamSpec   *pspec)
+{
+  localedObjectProxy *object = LOCALED_OBJECT_PROXY (gobject);
+  GDBusInterface *interface;
+
+  switch (prop_id)
+    {
+    case 1:
+      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.locale1");
+      g_value_take_object (value, interface);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+localed_object_proxy_class_init (localedObjectProxyClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = localed_object_proxy_set_property;
+  gobject_class->get_property = localed_object_proxy_get_property;
+
+  g_object_class_override_property (gobject_class, 1, "locale1");
+}
+
+/**
+ * localed_object_proxy_new:
+ * @connection: A #GDBusConnection.
+ * @object_path: An object path.
+ *
+ * Creates a new proxy object.
+ *
+ * Returns: (transfer full): The proxy object.
+ */
+localedObjectProxy *
+localed_object_proxy_new (GDBusConnection *connection,
+  const gchar *object_path)
+{
+  g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
+  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
+  return LOCALED_OBJECT_PROXY (g_object_new (LOCALED_TYPE_OBJECT_PROXY, "g-connection", connection, "g-object-path", object_path, NULL));
+}
+
+/**
+ * localedObjectSkeleton:
+ *
+ * The #localedObjectSkeleton structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * localedObjectSkeletonClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #localedObjectSkeleton.
  */
-Locale1 *
-locale1_skeleton_new (void)
+
+static void
+localed_object_skeleton__localed_object_iface_init (localedObjectIface *iface G_GNUC_UNUSED)
+{
+}
+
+
+static void
+localed_object_skeleton__g_dbus_object_iface_init (GDBusObjectIface *iface)
+{
+  iface->interface_added = localed_object_notify;
+  iface->interface_removed = localed_object_notify;
+}
+
+G_DEFINE_TYPE_WITH_CODE (localedObjectSkeleton, localed_object_skeleton, G_TYPE_DBUS_OBJECT_SKELETON,
+                         G_IMPLEMENT_INTERFACE (LOCALED_TYPE_OBJECT, localed_object_skeleton__localed_object_iface_init)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, localed_object_skeleton__g_dbus_object_iface_init));
+
+static void
+localed_object_skeleton_init (localedObjectSkeleton *object G_GNUC_UNUSED)
+{
+}
+
+static void
+localed_object_skeleton_set_property (GObject      *gobject,
+  guint         prop_id,
+  const GValue *value,
+  GParamSpec   *pspec)
+{
+  localedObjectSkeleton *object = LOCALED_OBJECT_SKELETON (gobject);
+  GDBusInterfaceSkeleton *interface;
+
+  switch (prop_id)
+    {
+    case 1:
+      interface = g_value_get_object (value);
+      if (interface != NULL)
+        {
+          g_warn_if_fail (LOCALED_IS_LOCALE1 (interface));
+          g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (object), interface);
+        }
+      else
+        {
+          g_dbus_object_skeleton_remove_interface_by_name (G_DBUS_OBJECT_SKELETON (object), "org.freedesktop.locale1");
+        }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+localed_object_skeleton_get_property (GObject      *gobject,
+  guint         prop_id,
+  GValue       *value,
+  GParamSpec   *pspec)
 {
-  return LOCALE1 (g_object_new (TYPE_LOCALE1_SKELETON, NULL));
+  localedObjectSkeleton *object = LOCALED_OBJECT_SKELETON (gobject);
+  GDBusInterface *interface;
+
+  switch (prop_id)
+    {
+    case 1:
+      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.locale1");
+      g_value_take_object (value, interface);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+  }
 }
 
+static void
+localed_object_skeleton_class_init (localedObjectSkeletonClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = localed_object_skeleton_set_property;
+  gobject_class->get_property = localed_object_skeleton_get_property;
+
+  g_object_class_override_property (gobject_class, 1, "locale1");
+}
+
+/**
+ * localed_object_skeleton_new:
+ * @object_path: An object path.
+ *
+ * Creates a new skeleton object.
+ *
+ * Returns: (transfer full): The skeleton object.
+ */
+localedObjectSkeleton *
+localed_object_skeleton_new (const gchar *object_path)
+{
+  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
+  return LOCALED_OBJECT_SKELETON (g_object_new (LOCALED_TYPE_OBJECT_SKELETON, "g-object-path", object_path, NULL));
+}
+
+/**
+ * localed_object_skeleton_set_locale1:
+ * @object: A #localedObjectSkeleton.
+ * @interface_: (allow-none): A #localedLocale1 or %NULL to clear the interface.
+ *
+ * Sets the #localedLocale1 instance for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-locale1.top_of_page">org.freedesktop.locale1</link> on @object.
+ */
+void localed_object_skeleton_set_locale1 (localedObjectSkeleton *object, localedLocale1 *interface_)
+{
+  g_object_set (G_OBJECT (object), "locale1", interface_, NULL);
+}
+
+
+/* ------------------------------------------------------------------------
+ * Code for ObjectManager client
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * SECTION:localedObjectManagerClient
+ * @title: localedObjectManagerClient
+ * @short_description: Generated GDBusObjectManagerClient type
+ *
+ * This section contains a #GDBusObjectManagerClient that uses localed_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc.
+ */
+
+/**
+ * localedObjectManagerClient:
+ *
+ * The #localedObjectManagerClient structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * localedObjectManagerClientClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #localedObjectManagerClient.
+ */
+
+G_DEFINE_TYPE (localedObjectManagerClient, localed_object_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT);
+
+static void
+localed_object_manager_client_init (localedObjectManagerClient *manager G_GNUC_UNUSED)
+{
+}
+
+static void
+localed_object_manager_client_class_init (localedObjectManagerClientClass *klass G_GNUC_UNUSED)
+{
+}
+
+/**
+ * localed_object_manager_client_get_proxy_type:
+ * @manager: A #GDBusObjectManagerClient.
+ * @object_path: The object path of the remote object (unused).
+ * @interface_name: (allow-none): Interface name of the remote object or %NULL to get the object proxy #GType.
+ * @user_data: User data (unused).
+ *
+ * A #GDBusProxyTypeFunc that maps @interface_name to the generated #GDBusObjectProxy<!-- -->- and #GDBusProxy<!-- -->-derived types.
+ *
+ * Returns: A #GDBusProxy<!-- -->-derived #GType if @interface_name is not %NULL, otherwise the #GType for #localedObjectProxy.
+ */
+GType
+localed_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager G_GNUC_UNUSED, const gchar *object_path G_GNUC_UNUSED, const gchar *interface_name, gpointer user_data G_GNUC_UNUSED)
+{
+  static gsize once_init_value = 0;
+  static GHashTable *lookup_hash;
+  GType ret;
+
+  if (interface_name == NULL)
+    return LOCALED_TYPE_OBJECT_PROXY;
+  if (g_once_init_enter (&once_init_value))
+    {
+      lookup_hash = g_hash_table_new (g_str_hash, g_str_equal);
+      g_hash_table_insert (lookup_hash, (gpointer) "org.freedesktop.locale1", GSIZE_TO_POINTER (LOCALED_TYPE_LOCALE1_PROXY));
+      g_once_init_leave (&once_init_value, 1);
+    }
+  ret = (GType) GPOINTER_TO_SIZE (g_hash_table_lookup (lookup_hash, interface_name));
+  if (ret == (GType) 0)
+    ret = G_TYPE_DBUS_PROXY;
+  return ret;
+}
+
+/**
+ * localed_object_manager_client_new:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously creates #GDBusObjectManagerClient using localed_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new() for more details.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call localed_object_manager_client_new_finish() to get the result of the operation.
+ *
+ * See localed_object_manager_client_new_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+localed_object_manager_client_new (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data)
+{
+  g_async_initable_new_async (LOCALED_TYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", localed_object_manager_client_get_proxy_type, NULL);
+}
+
+/**
+ * localed_object_manager_client_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to localed_object_manager_client_new().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with localed_object_manager_client_new().
+ *
+ * Returns: (transfer full) (type localedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+localed_object_manager_client_new_finish (
+    GAsyncResult        *res,
+    GError             **error)
+{
+  GObject *ret;
+  GObject *source_object;
+  source_object = g_async_result_get_source_object (res);
+  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+  g_object_unref (source_object);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+/**
+ * localed_object_manager_client_new_sync:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Synchronously creates #GDBusObjectManagerClient using localed_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new_sync() for more details.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See localed_object_manager_client_new() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type localedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+localed_object_manager_client_new_sync (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error)
+{
+  GInitable *ret;
+  ret = g_initable_new (LOCALED_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", localed_object_manager_client_get_proxy_type, NULL);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+
+/**
+ * localed_object_manager_client_new_for_bus:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Like localed_object_manager_client_new() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call localed_object_manager_client_new_for_bus_finish() to get the result of the operation.
+ *
+ * See localed_object_manager_client_new_for_bus_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+localed_object_manager_client_new_for_bus (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data)
+{
+  g_async_initable_new_async (LOCALED_TYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", localed_object_manager_client_get_proxy_type, NULL);
+}
+
+/**
+ * localed_object_manager_client_new_for_bus_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to localed_object_manager_client_new_for_bus().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with localed_object_manager_client_new_for_bus().
+ *
+ * Returns: (transfer full) (type localedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+localed_object_manager_client_new_for_bus_finish (
+    GAsyncResult        *res,
+    GError             **error)
+{
+  GObject *ret;
+  GObject *source_object;
+  source_object = g_async_result_get_source_object (res);
+  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+  g_object_unref (source_object);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+/**
+ * localed_object_manager_client_new_for_bus_sync:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Like localed_object_manager_client_new_sync() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See localed_object_manager_client_new_for_bus() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type localedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+localed_object_manager_client_new_for_bus_sync (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error)
+{
+  GInitable *ret;
+  ret = g_initable_new (LOCALED_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", localed_object_manager_client_get_proxy_type, NULL);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+
diff --git a/src/interfaces/localed/localed-gen.h b/src/interfaces/localed/localed-gen.h
index cf03e06..51671cc 100644
--- a/src/interfaces/localed/localed-gen.h
+++ b/src/interfaces/localed/localed-gen.h
@@ -15,214 +15,214 @@ G_BEGIN_DECLS
 /* ------------------------------------------------------------------------ */
 /* Declarations for org.freedesktop.locale1 */
 
-#define TYPE_LOCALE1 (locale1_get_type ())
-#define LOCALE1(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_LOCALE1, Locale1))
-#define IS_LOCALE1(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_LOCALE1))
-#define LOCALE1_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TYPE_LOCALE1, Locale1Iface))
+#define LOCALED_TYPE_LOCALE1 (localed_locale1_get_type ())
+#define LOCALED_LOCALE1(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOCALED_TYPE_LOCALE1, localedLocale1))
+#define LOCALED_IS_LOCALE1(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOCALED_TYPE_LOCALE1))
+#define LOCALED_LOCALE1_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), LOCALED_TYPE_LOCALE1, localedLocale1Iface))
 
-struct _Locale1;
-typedef struct _Locale1 Locale1;
-typedef struct _Locale1Iface Locale1Iface;
+struct _localedLocale1;
+typedef struct _localedLocale1 localedLocale1;
+typedef struct _localedLocale1Iface localedLocale1Iface;
 
-struct _Locale1Iface
+struct _localedLocale1Iface
 {
   GTypeInterface parent_iface;
 
 
   gboolean (*handle_set_locale) (
-    Locale1 *object,
+    localedLocale1 *object,
     GDBusMethodInvocation *invocation,
-    const gchar *const *arg_locale,
-    gboolean arg_user_interaction);
+    const gchar *const *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1);
 
   gboolean (*handle_set_vconsole_keyboard) (
-    Locale1 *object,
+    localedLocale1 *object,
     GDBusMethodInvocation *invocation,
-    const gchar *arg_keymap,
-    const gchar *arg_keymap_toggle,
-    gboolean arg_convert,
-    gboolean arg_user_interaction);
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
+    gboolean arg_unnamed_arg3);
 
   gboolean (*handle_set_x11_keyboard) (
-    Locale1 *object,
+    localedLocale1 *object,
     GDBusMethodInvocation *invocation,
-    const gchar *arg_layout,
-    const gchar *arg_model,
-    const gchar *arg_variant,
-    const gchar *arg_options,
-    gboolean arg_convert,
-    gboolean arg_user_interaction);
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    const gchar *arg_unnamed_arg2,
+    const gchar *arg_unnamed_arg3,
+    gboolean arg_unnamed_arg4,
+    gboolean arg_unnamed_arg5);
 
-  const gchar *const * (*get_locale) (Locale1 *object);
+  const gchar *const * (*get_locale) (localedLocale1 *object);
 
-  const gchar * (*get_vconsole_keymap) (Locale1 *object);
+  const gchar * (*get_vconsole_keymap) (localedLocale1 *object);
 
-  const gchar * (*get_vconsole_keymap_toggle) (Locale1 *object);
+  const gchar * (*get_vconsole_keymap_toggle) (localedLocale1 *object);
 
-  const gchar * (*get_x11_layout) (Locale1 *object);
+  const gchar * (*get_x11_layout) (localedLocale1 *object);
 
-  const gchar * (*get_x11_model) (Locale1 *object);
+  const gchar * (*get_x11_model) (localedLocale1 *object);
 
-  const gchar * (*get_x11_options) (Locale1 *object);
+  const gchar * (*get_x11_options) (localedLocale1 *object);
 
-  const gchar * (*get_x11_variant) (Locale1 *object);
+  const gchar * (*get_x11_variant) (localedLocale1 *object);
 
 };
 
-GType locale1_get_type (void) G_GNUC_CONST;
+GType localed_locale1_get_type (void) G_GNUC_CONST;
 
-GDBusInterfaceInfo *locale1_interface_info (void);
-guint locale1_override_properties (GObjectClass *klass, guint property_id_begin);
+GDBusInterfaceInfo *localed_locale1_interface_info (void);
+guint localed_locale1_override_properties (GObjectClass *klass, guint property_id_begin);
 
 
 /* D-Bus method call completion functions: */
-void locale1_complete_set_locale (
-    Locale1 *object,
+void localed_locale1_complete_set_locale (
+    localedLocale1 *object,
     GDBusMethodInvocation *invocation);
 
-void locale1_complete_set_vconsole_keyboard (
-    Locale1 *object,
+void localed_locale1_complete_set_vconsole_keyboard (
+    localedLocale1 *object,
     GDBusMethodInvocation *invocation);
 
-void locale1_complete_set_x11_keyboard (
-    Locale1 *object,
+void localed_locale1_complete_set_x11_keyboard (
+    localedLocale1 *object,
     GDBusMethodInvocation *invocation);
 
 
 
 /* D-Bus method calls: */
-void locale1_call_set_locale (
-    Locale1 *proxy,
-    const gchar *const *arg_locale,
-    gboolean arg_user_interaction,
+void localed_locale1_call_set_locale (
+    localedLocale1 *proxy,
+    const gchar *const *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean locale1_call_set_locale_finish (
-    Locale1 *proxy,
+gboolean localed_locale1_call_set_locale_finish (
+    localedLocale1 *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean locale1_call_set_locale_sync (
-    Locale1 *proxy,
-    const gchar *const *arg_locale,
-    gboolean arg_user_interaction,
+gboolean localed_locale1_call_set_locale_sync (
+    localedLocale1 *proxy,
+    const gchar *const *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
-void locale1_call_set_vconsole_keyboard (
-    Locale1 *proxy,
-    const gchar *arg_keymap,
-    const gchar *arg_keymap_toggle,
-    gboolean arg_convert,
-    gboolean arg_user_interaction,
+void localed_locale1_call_set_vconsole_keyboard (
+    localedLocale1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
+    gboolean arg_unnamed_arg3,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean locale1_call_set_vconsole_keyboard_finish (
-    Locale1 *proxy,
+gboolean localed_locale1_call_set_vconsole_keyboard_finish (
+    localedLocale1 *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean locale1_call_set_vconsole_keyboard_sync (
-    Locale1 *proxy,
-    const gchar *arg_keymap,
-    const gchar *arg_keymap_toggle,
-    gboolean arg_convert,
-    gboolean arg_user_interaction,
+gboolean localed_locale1_call_set_vconsole_keyboard_sync (
+    localedLocale1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
+    gboolean arg_unnamed_arg3,
     GCancellable *cancellable,
     GError **error);
 
-void locale1_call_set_x11_keyboard (
-    Locale1 *proxy,
-    const gchar *arg_layout,
-    const gchar *arg_model,
-    const gchar *arg_variant,
-    const gchar *arg_options,
-    gboolean arg_convert,
-    gboolean arg_user_interaction,
+void localed_locale1_call_set_x11_keyboard (
+    localedLocale1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    const gchar *arg_unnamed_arg2,
+    const gchar *arg_unnamed_arg3,
+    gboolean arg_unnamed_arg4,
+    gboolean arg_unnamed_arg5,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean locale1_call_set_x11_keyboard_finish (
-    Locale1 *proxy,
+gboolean localed_locale1_call_set_x11_keyboard_finish (
+    localedLocale1 *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean locale1_call_set_x11_keyboard_sync (
-    Locale1 *proxy,
-    const gchar *arg_layout,
-    const gchar *arg_model,
-    const gchar *arg_variant,
-    const gchar *arg_options,
-    gboolean arg_convert,
-    gboolean arg_user_interaction,
+gboolean localed_locale1_call_set_x11_keyboard_sync (
+    localedLocale1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    const gchar *arg_unnamed_arg1,
+    const gchar *arg_unnamed_arg2,
+    const gchar *arg_unnamed_arg3,
+    gboolean arg_unnamed_arg4,
+    gboolean arg_unnamed_arg5,
     GCancellable *cancellable,
     GError **error);
 
 
 
 /* D-Bus property accessors: */
-const gchar *const *locale1_get_locale (Locale1 *object);
-gchar **locale1_dup_locale (Locale1 *object);
-void locale1_set_locale (Locale1 *object, const gchar *const *value);
+const gchar *const *localed_locale1_get_locale (localedLocale1 *object);
+gchar **localed_locale1_dup_locale (localedLocale1 *object);
+void localed_locale1_set_locale (localedLocale1 *object, const gchar *const *value);
 
-const gchar *locale1_get_vconsole_keymap (Locale1 *object);
-gchar *locale1_dup_vconsole_keymap (Locale1 *object);
-void locale1_set_vconsole_keymap (Locale1 *object, const gchar *value);
+const gchar *localed_locale1_get_x11_layout (localedLocale1 *object);
+gchar *localed_locale1_dup_x11_layout (localedLocale1 *object);
+void localed_locale1_set_x11_layout (localedLocale1 *object, const gchar *value);
 
-const gchar *locale1_get_vconsole_keymap_toggle (Locale1 *object);
-gchar *locale1_dup_vconsole_keymap_toggle (Locale1 *object);
-void locale1_set_vconsole_keymap_toggle (Locale1 *object, const gchar *value);
+const gchar *localed_locale1_get_x11_model (localedLocale1 *object);
+gchar *localed_locale1_dup_x11_model (localedLocale1 *object);
+void localed_locale1_set_x11_model (localedLocale1 *object, const gchar *value);
 
-const gchar *locale1_get_x11_layout (Locale1 *object);
-gchar *locale1_dup_x11_layout (Locale1 *object);
-void locale1_set_x11_layout (Locale1 *object, const gchar *value);
+const gchar *localed_locale1_get_x11_variant (localedLocale1 *object);
+gchar *localed_locale1_dup_x11_variant (localedLocale1 *object);
+void localed_locale1_set_x11_variant (localedLocale1 *object, const gchar *value);
 
-const gchar *locale1_get_x11_model (Locale1 *object);
-gchar *locale1_dup_x11_model (Locale1 *object);
-void locale1_set_x11_model (Locale1 *object, const gchar *value);
+const gchar *localed_locale1_get_x11_options (localedLocale1 *object);
+gchar *localed_locale1_dup_x11_options (localedLocale1 *object);
+void localed_locale1_set_x11_options (localedLocale1 *object, const gchar *value);
 
-const gchar *locale1_get_x11_variant (Locale1 *object);
-gchar *locale1_dup_x11_variant (Locale1 *object);
-void locale1_set_x11_variant (Locale1 *object, const gchar *value);
+const gchar *localed_locale1_get_vconsole_keymap (localedLocale1 *object);
+gchar *localed_locale1_dup_vconsole_keymap (localedLocale1 *object);
+void localed_locale1_set_vconsole_keymap (localedLocale1 *object, const gchar *value);
 
-const gchar *locale1_get_x11_options (Locale1 *object);
-gchar *locale1_dup_x11_options (Locale1 *object);
-void locale1_set_x11_options (Locale1 *object, const gchar *value);
+const gchar *localed_locale1_get_vconsole_keymap_toggle (localedLocale1 *object);
+gchar *localed_locale1_dup_vconsole_keymap_toggle (localedLocale1 *object);
+void localed_locale1_set_vconsole_keymap_toggle (localedLocale1 *object, const gchar *value);
 
 
 /* ---- */
 
-#define TYPE_LOCALE1_PROXY (locale1_proxy_get_type ())
-#define LOCALE1_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_LOCALE1_PROXY, Locale1Proxy))
-#define LOCALE1_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_LOCALE1_PROXY, Locale1ProxyClass))
-#define LOCALE1_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_LOCALE1_PROXY, Locale1ProxyClass))
-#define IS_LOCALE1_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_LOCALE1_PROXY))
-#define IS_LOCALE1_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_LOCALE1_PROXY))
+#define LOCALED_TYPE_LOCALE1_PROXY (localed_locale1_proxy_get_type ())
+#define LOCALED_LOCALE1_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOCALED_TYPE_LOCALE1_PROXY, localedLocale1Proxy))
+#define LOCALED_LOCALE1_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOCALED_TYPE_LOCALE1_PROXY, localedLocale1ProxyClass))
+#define LOCALED_LOCALE1_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOCALED_TYPE_LOCALE1_PROXY, localedLocale1ProxyClass))
+#define LOCALED_IS_LOCALE1_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOCALED_TYPE_LOCALE1_PROXY))
+#define LOCALED_IS_LOCALE1_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOCALED_TYPE_LOCALE1_PROXY))
 
-typedef struct _Locale1Proxy Locale1Proxy;
-typedef struct _Locale1ProxyClass Locale1ProxyClass;
-typedef struct _Locale1ProxyPrivate Locale1ProxyPrivate;
+typedef struct _localedLocale1Proxy localedLocale1Proxy;
+typedef struct _localedLocale1ProxyClass localedLocale1ProxyClass;
+typedef struct _localedLocale1ProxyPrivate localedLocale1ProxyPrivate;
 
-struct _Locale1Proxy
+struct _localedLocale1Proxy
 {
   /*< private >*/
   GDBusProxy parent_instance;
-  Locale1ProxyPrivate *priv;
+  localedLocale1ProxyPrivate *priv;
 };
 
-struct _Locale1ProxyClass
+struct _localedLocale1ProxyClass
 {
   GDBusProxyClass parent_class;
 };
 
-GType locale1_proxy_get_type (void) G_GNUC_CONST;
+GType localed_locale1_proxy_get_type (void) G_GNUC_CONST;
 
-void locale1_proxy_new (
+void localed_locale1_proxy_new (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -230,10 +230,10 @@ void locale1_proxy_new (
     GCancellable        *cancellable,
     GAsyncReadyCallback  callback,
     gpointer             user_data);
-Locale1 *locale1_proxy_new_finish (
+localedLocale1 *localed_locale1_proxy_new_finish (
     GAsyncResult        *res,
     GError             **error);
-Locale1 *locale1_proxy_new_sync (
+localedLocale1 *localed_locale1_proxy_new_sync (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -241,7 +241,7 @@ Locale1 *locale1_proxy_new_sync (
     GCancellable        *cancellable,
     GError             **error);
 
-void locale1_proxy_new_for_bus (
+void localed_locale1_proxy_new_for_bus (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -249,10 +249,10 @@ void locale1_proxy_new_for_bus (
     GCancellable        *cancellable,
     GAsyncReadyCallback  callback,
     gpointer             user_data);
-Locale1 *locale1_proxy_new_for_bus_finish (
+localedLocale1 *localed_locale1_proxy_new_for_bus_finish (
     GAsyncResult        *res,
     GError             **error);
-Locale1 *locale1_proxy_new_for_bus_sync (
+localedLocale1 *localed_locale1_proxy_new_for_bus_sync (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -263,32 +263,174 @@ Locale1 *locale1_proxy_new_for_bus_sync (
 
 /* ---- */
 
-#define TYPE_LOCALE1_SKELETON (locale1_skeleton_get_type ())
-#define LOCALE1_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_LOCALE1_SKELETON, Locale1Skeleton))
-#define LOCALE1_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_LOCALE1_SKELETON, Locale1SkeletonClass))
-#define LOCALE1_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_LOCALE1_SKELETON, Locale1SkeletonClass))
-#define IS_LOCALE1_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_LOCALE1_SKELETON))
-#define IS_LOCALE1_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_LOCALE1_SKELETON))
+#define LOCALED_TYPE_LOCALE1_SKELETON (localed_locale1_skeleton_get_type ())
+#define LOCALED_LOCALE1_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOCALED_TYPE_LOCALE1_SKELETON, localedLocale1Skeleton))
+#define LOCALED_LOCALE1_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOCALED_TYPE_LOCALE1_SKELETON, localedLocale1SkeletonClass))
+#define LOCALED_LOCALE1_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOCALED_TYPE_LOCALE1_SKELETON, localedLocale1SkeletonClass))
+#define LOCALED_IS_LOCALE1_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOCALED_TYPE_LOCALE1_SKELETON))
+#define LOCALED_IS_LOCALE1_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOCALED_TYPE_LOCALE1_SKELETON))
 
-typedef struct _Locale1Skeleton Locale1Skeleton;
-typedef struct _Locale1SkeletonClass Locale1SkeletonClass;
-typedef struct _Locale1SkeletonPrivate Locale1SkeletonPrivate;
+typedef struct _localedLocale1Skeleton localedLocale1Skeleton;
+typedef struct _localedLocale1SkeletonClass localedLocale1SkeletonClass;
+typedef struct _localedLocale1SkeletonPrivate localedLocale1SkeletonPrivate;
 
-struct _Locale1Skeleton
+struct _localedLocale1Skeleton
 {
   /*< private >*/
   GDBusInterfaceSkeleton parent_instance;
-  Locale1SkeletonPrivate *priv;
+  localedLocale1SkeletonPrivate *priv;
 };
 
-struct _Locale1SkeletonClass
+struct _localedLocale1SkeletonClass
 {
   GDBusInterfaceSkeletonClass parent_class;
 };
 
-GType locale1_skeleton_get_type (void) G_GNUC_CONST;
+GType localed_locale1_skeleton_get_type (void) G_GNUC_CONST;
 
-Locale1 *locale1_skeleton_new (void);
+localedLocale1 *localed_locale1_skeleton_new (void);
+
+
+/* ---- */
+
+#define LOCALED_TYPE_OBJECT (localed_object_get_type ())
+#define LOCALED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOCALED_TYPE_OBJECT, localedObject))
+#define LOCALED_IS_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOCALED_TYPE_OBJECT))
+#define LOCALED_OBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), LOCALED_TYPE_OBJECT, localedObject))
+
+struct _localedObject;
+typedef struct _localedObject localedObject;
+typedef struct _localedObjectIface localedObjectIface;
+
+struct _localedObjectIface
+{
+  GTypeInterface parent_iface;
+};
+
+GType localed_object_get_type (void) G_GNUC_CONST;
+
+localedLocale1 *localed_object_get_locale1 (localedObject *object);
+localedLocale1 *localed_object_peek_locale1 (localedObject *object);
+
+#define LOCALED_TYPE_OBJECT_PROXY (localed_object_proxy_get_type ())
+#define LOCALED_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOCALED_TYPE_OBJECT_PROXY, localedObjectProxy))
+#define LOCALED_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOCALED_TYPE_OBJECT_PROXY, localedObjectProxyClass))
+#define LOCALED_OBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOCALED_TYPE_OBJECT_PROXY, localedObjectProxyClass))
+#define LOCALED_IS_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOCALED_TYPE_OBJECT_PROXY))
+#define LOCALED_IS_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOCALED_TYPE_OBJECT_PROXY))
+
+typedef struct _localedObjectProxy localedObjectProxy;
+typedef struct _localedObjectProxyClass localedObjectProxyClass;
+typedef struct _localedObjectProxyPrivate localedObjectProxyPrivate;
+
+struct _localedObjectProxy
+{
+  /*< private >*/
+  GDBusObjectProxy parent_instance;
+  localedObjectProxyPrivate *priv;
+};
+
+struct _localedObjectProxyClass
+{
+  GDBusObjectProxyClass parent_class;
+};
+
+GType localed_object_proxy_get_type (void) G_GNUC_CONST;
+localedObjectProxy *localed_object_proxy_new (GDBusConnection *connection, const gchar *object_path);
+
+#define LOCALED_TYPE_OBJECT_SKELETON (localed_object_skeleton_get_type ())
+#define LOCALED_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOCALED_TYPE_OBJECT_SKELETON, localedObjectSkeleton))
+#define LOCALED_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOCALED_TYPE_OBJECT_SKELETON, localedObjectSkeletonClass))
+#define LOCALED_OBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOCALED_TYPE_OBJECT_SKELETON, localedObjectSkeletonClass))
+#define LOCALED_IS_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOCALED_TYPE_OBJECT_SKELETON))
+#define LOCALED_IS_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOCALED_TYPE_OBJECT_SKELETON))
+
+typedef struct _localedObjectSkeleton localedObjectSkeleton;
+typedef struct _localedObjectSkeletonClass localedObjectSkeletonClass;
+typedef struct _localedObjectSkeletonPrivate localedObjectSkeletonPrivate;
+
+struct _localedObjectSkeleton
+{
+  /*< private >*/
+  GDBusObjectSkeleton parent_instance;
+  localedObjectSkeletonPrivate *priv;
+};
+
+struct _localedObjectSkeletonClass
+{
+  GDBusObjectSkeletonClass parent_class;
+};
+
+GType localed_object_skeleton_get_type (void) G_GNUC_CONST;
+localedObjectSkeleton *localed_object_skeleton_new (const gchar *object_path);
+void localed_object_skeleton_set_locale1 (localedObjectSkeleton *object, localedLocale1 *interface_);
+
+/* ---- */
+
+#define LOCALED_TYPE_OBJECT_MANAGER_CLIENT (localed_object_manager_client_get_type ())
+#define LOCALED_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOCALED_TYPE_OBJECT_MANAGER_CLIENT, localedObjectManagerClient))
+#define LOCALED_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOCALED_TYPE_OBJECT_MANAGER_CLIENT, localedObjectManagerClientClass))
+#define LOCALED_OBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOCALED_TYPE_OBJECT_MANAGER_CLIENT, localedObjectManagerClientClass))
+#define LOCALED_IS_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOCALED_TYPE_OBJECT_MANAGER_CLIENT))
+#define LOCALED_IS_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOCALED_TYPE_OBJECT_MANAGER_CLIENT))
+
+typedef struct _localedObjectManagerClient localedObjectManagerClient;
+typedef struct _localedObjectManagerClientClass localedObjectManagerClientClass;
+typedef struct _localedObjectManagerClientPrivate localedObjectManagerClientPrivate;
+
+struct _localedObjectManagerClient
+{
+  /*< private >*/
+  GDBusObjectManagerClient parent_instance;
+  localedObjectManagerClientPrivate *priv;
+};
+
+struct _localedObjectManagerClientClass
+{
+  GDBusObjectManagerClientClass parent_class;
+};
+
+GType localed_object_manager_client_get_type (void) G_GNUC_CONST;
+
+GType localed_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data);
+
+void localed_object_manager_client_new (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data);
+GDBusObjectManager *localed_object_manager_client_new_finish (
+    GAsyncResult        *res,
+    GError             **error);
+GDBusObjectManager *localed_object_manager_client_new_sync (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error);
+
+void localed_object_manager_client_new_for_bus (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data);
+GDBusObjectManager *localed_object_manager_client_new_for_bus_finish (
+    GAsyncResult        *res,
+    GError             **error);
+GDBusObjectManager *localed_object_manager_client_new_for_bus_sync (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error);
 
 
 G_END_DECLS
diff --git a/src/interfaces/logind/logind-gen.c b/src/interfaces/logind/logind-gen.c
index 37df37b..86c5f12 100644
--- a/src/interfaces/logind/logind-gen.c
+++ b/src/interfaces/logind/logind-gen.c
@@ -8,7 +8,7 @@
 #  include "config.h"
 #endif
 
-#include "src/interfaces/logind/logind-gen.h"
+#include "logind-gen.h"
 
 #include <string.h>
 #ifdef G_OS_UNIX
@@ -154,8 +154,8 @@ _g_value_equal (const GValue *a, const GValue *b)
  */
 
 /**
- * SECTION:Login1Manager
- * @title: Login1Manager
+ * SECTION:logindLogin1Manager
+ * @title: logindLogin1Manager
  * @short_description: Generated C code for the org.freedesktop.login1.Manager D-Bus interface
  *
  * This section contains code for working with the <link linkend="gdbus-interface-org-freedesktop-login1-Manager.top_of_page">org.freedesktop.login1.Manager</link> D-Bus interface in C.
@@ -163,7 +163,7 @@ _g_value_equal (const GValue *a, const GValue *b)
 
 /* ---- Introspection data for org.freedesktop.login1.Manager ---- */
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_session_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_session_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -174,13 +174,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_session_IN_AR
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_session_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_session_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_session_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_get_session_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_session_OUT_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_session_OUT_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -191,26 +191,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_session_OUT_A
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_session_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_session_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_session_OUT_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_get_session_OUT_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_get_session =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_get_session =
 {
   {
     -1,
     (gchar *) "GetSession",
-    (GDBusArgInfo **) &_login1_manager_method_info_get_session_IN_ARG_pointers,
-    (GDBusArgInfo **) &_login1_manager_method_info_get_session_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_session_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_session_OUT_ARG_pointers,
     NULL
   },
   "handle-get-session",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_session_by_pid_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_session_by_pid_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -221,13 +221,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_session_by_pi
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_session_by_pid_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_session_by_pid_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_session_by_pid_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_get_session_by_pid_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_session_by_pid_OUT_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_session_by_pid_OUT_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -238,26 +238,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_session_by_pi
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_session_by_pid_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_session_by_pid_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_session_by_pid_OUT_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_get_session_by_pid_OUT_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_get_session_by_pid =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_get_session_by_pid =
 {
   {
     -1,
     (gchar *) "GetSessionByPID",
-    (GDBusArgInfo **) &_login1_manager_method_info_get_session_by_pid_IN_ARG_pointers,
-    (GDBusArgInfo **) &_login1_manager_method_info_get_session_by_pid_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_session_by_pid_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_session_by_pid_OUT_ARG_pointers,
     NULL
   },
   "handle-get-session-by-pid",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_user_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_user_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -268,13 +268,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_user_IN_ARG_u
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_user_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_user_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_user_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_get_user_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_user_OUT_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_user_OUT_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -285,26 +285,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_user_OUT_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_user_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_user_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_user_OUT_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_get_user_OUT_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_get_user =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_get_user =
 {
   {
     -1,
     (gchar *) "GetUser",
-    (GDBusArgInfo **) &_login1_manager_method_info_get_user_IN_ARG_pointers,
-    (GDBusArgInfo **) &_login1_manager_method_info_get_user_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_user_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_user_OUT_ARG_pointers,
     NULL
   },
   "handle-get-user",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_user_by_pid_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_user_by_pid_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -315,13 +315,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_user_by_pid_I
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_user_by_pid_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_user_by_pid_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_user_by_pid_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_get_user_by_pid_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_user_by_pid_OUT_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_user_by_pid_OUT_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -332,26 +332,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_user_by_pid_O
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_user_by_pid_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_user_by_pid_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_user_by_pid_OUT_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_get_user_by_pid_OUT_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_get_user_by_pid =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_get_user_by_pid =
 {
   {
     -1,
     (gchar *) "GetUserByPID",
-    (GDBusArgInfo **) &_login1_manager_method_info_get_user_by_pid_IN_ARG_pointers,
-    (GDBusArgInfo **) &_login1_manager_method_info_get_user_by_pid_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_user_by_pid_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_user_by_pid_OUT_ARG_pointers,
     NULL
   },
   "handle-get-user-by-pid",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_seat_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_seat_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -362,13 +362,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_seat_IN_ARG_u
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_seat_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_seat_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_seat_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_get_seat_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_seat_OUT_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_get_seat_OUT_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -379,26 +379,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_get_seat_OUT_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_get_seat_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_get_seat_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_get_seat_OUT_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_get_seat_OUT_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_get_seat =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_get_seat =
 {
   {
     -1,
     (gchar *) "GetSeat",
-    (GDBusArgInfo **) &_login1_manager_method_info_get_seat_IN_ARG_pointers,
-    (GDBusArgInfo **) &_login1_manager_method_info_get_seat_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_seat_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_get_seat_OUT_ARG_pointers,
     NULL
   },
   "handle-get-seat",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_list_sessions_OUT_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_list_sessions_OUT_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -409,26 +409,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_list_sessions_OUT
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_list_sessions_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_list_sessions_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_list_sessions_OUT_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_list_sessions_OUT_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_list_sessions =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_list_sessions =
 {
   {
     -1,
     (gchar *) "ListSessions",
     NULL,
-    (GDBusArgInfo **) &_login1_manager_method_info_list_sessions_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_list_sessions_OUT_ARG_pointers,
     NULL
   },
   "handle-list-sessions",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_list_users_OUT_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_list_users_OUT_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -439,26 +439,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_list_users_OUT_AR
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_list_users_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_list_users_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_list_users_OUT_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_list_users_OUT_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_list_users =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_list_users =
 {
   {
     -1,
     (gchar *) "ListUsers",
     NULL,
-    (GDBusArgInfo **) &_login1_manager_method_info_list_users_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_list_users_OUT_ARG_pointers,
     NULL
   },
   "handle-list-users",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_list_seats_OUT_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_list_seats_OUT_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -469,26 +469,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_list_seats_OUT_AR
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_list_seats_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_list_seats_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_list_seats_OUT_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_list_seats_OUT_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_list_seats =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_list_seats =
 {
   {
     -1,
     (gchar *) "ListSeats",
     NULL,
-    (GDBusArgInfo **) &_login1_manager_method_info_list_seats_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_list_seats_OUT_ARG_pointers,
     NULL
   },
   "handle-list-seats",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_list_inhibitors_OUT_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_list_inhibitors_OUT_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -499,26 +499,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_list_inhibitors_O
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_list_inhibitors_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_list_inhibitors_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_list_inhibitors_OUT_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_list_inhibitors_OUT_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_list_inhibitors =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_list_inhibitors =
 {
   {
     -1,
     (gchar *) "ListInhibitors",
     NULL,
-    (GDBusArgInfo **) &_login1_manager_method_info_list_inhibitors_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_list_inhibitors_OUT_ARG_pointers,
     NULL
   },
   "handle-list-inhibitors",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -529,7 +529,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -540,7 +540,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg2 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg2 =
 {
   {
     -1,
@@ -551,7 +551,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg3 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg3 =
 {
   {
     -1,
@@ -562,7 +562,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg4 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg4 =
 {
   {
     -1,
@@ -573,7 +573,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg5 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg5 =
 {
   {
     -1,
@@ -584,7 +584,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg6 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg6 =
 {
   {
     -1,
@@ -595,7 +595,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg7 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg7 =
 {
   {
     -1,
@@ -606,7 +606,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg8 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg8 =
 {
   {
     -1,
@@ -617,7 +617,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg9 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg9 =
 {
   {
     -1,
@@ -628,7 +628,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg10 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg10 =
 {
   {
     -1,
@@ -639,7 +639,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg11 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg11 =
 {
   {
     -1,
@@ -650,7 +650,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg12 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg12 =
 {
   {
     -1,
@@ -661,7 +661,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN_ARG_unnamed_arg13 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg13 =
 {
   {
     -1,
@@ -672,26 +672,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_create_session_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_create_session_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg0,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg1,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg2,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg3,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg4,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg5,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg6,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg7,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg8,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg9,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg10,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg11,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg12,
-  &_login1_manager_method_info_create_session_IN_ARG_unnamed_arg13,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg2,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg3,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg4,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg5,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg6,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg7,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg8,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg9,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg10,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg11,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg12,
+  &_logind_login1_manager_method_info_create_session_IN_ARG_unnamed_arg13,
   NULL
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OUT_ARG_unnamed_arg14 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg14 =
 {
   {
     -1,
@@ -702,7 +702,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OU
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OUT_ARG_unnamed_arg15 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg15 =
 {
   {
     -1,
@@ -713,7 +713,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OU
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OUT_ARG_unnamed_arg16 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg16 =
 {
   {
     -1,
@@ -724,7 +724,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OU
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OUT_ARG_unnamed_arg17 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg17 =
 {
   {
     -1,
@@ -735,7 +735,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OU
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OUT_ARG_unnamed_arg18 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg18 =
 {
   {
     -1,
@@ -746,7 +746,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OU
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OUT_ARG_unnamed_arg19 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg19 =
 {
   {
     -1,
@@ -757,7 +757,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OU
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OUT_ARG_unnamed_arg20 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg20 =
 {
   {
     -1,
@@ -768,7 +768,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OU
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OUT_ARG_unnamed_arg21 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg21 =
 {
   {
     -1,
@@ -779,20 +779,20 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_create_session_OU
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_create_session_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_create_session_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg14,
-  &_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg15,
-  &_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg16,
-  &_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg17,
-  &_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg18,
-  &_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg19,
-  &_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg20,
-  &_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg21,
+  &_logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg14,
+  &_logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg15,
+  &_logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg16,
+  &_logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg17,
+  &_logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg18,
+  &_logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg19,
+  &_logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg20,
+  &_logind_login1_manager_method_info_create_session_OUT_ARG_unnamed_arg21,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_create_session_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_create_session_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -800,26 +800,26 @@ static const GDBusAnnotationInfo _login1_manager_method_create_session_annotatio
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_create_session_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_create_session_annotation_info_pointers[] =
 {
-  &_login1_manager_method_create_session_annotation_info_0,
+  &_logind_login1_manager_method_create_session_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_create_session =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_create_session =
 {
   {
     -1,
     (gchar *) "CreateSession",
-    (GDBusArgInfo **) &_login1_manager_method_info_create_session_IN_ARG_pointers,
-    (GDBusArgInfo **) &_login1_manager_method_info_create_session_OUT_ARG_pointers,
-    (GDBusAnnotationInfo **) &_login1_manager_method_create_session_annotation_info_pointers
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_create_session_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_create_session_OUT_ARG_pointers,
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_create_session_annotation_info_pointers
   },
   "handle-create-session",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_release_session_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_release_session_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -830,13 +830,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_release_session_I
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_release_session_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_release_session_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_release_session_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_release_session_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_release_session_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_release_session_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -844,26 +844,26 @@ static const GDBusAnnotationInfo _login1_manager_method_release_session_annotati
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_release_session_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_release_session_annotation_info_pointers[] =
 {
-  &_login1_manager_method_release_session_annotation_info_0,
+  &_logind_login1_manager_method_release_session_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_release_session =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_release_session =
 {
   {
     -1,
     (gchar *) "ReleaseSession",
-    (GDBusArgInfo **) &_login1_manager_method_info_release_session_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_release_session_IN_ARG_pointers,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_release_session_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_release_session_annotation_info_pointers
   },
   "handle-release-session",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_activate_session_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_activate_session_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -874,18 +874,18 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_activate_session_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_activate_session_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_activate_session_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_activate_session_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_activate_session_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_activate_session =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_activate_session =
 {
   {
     -1,
     (gchar *) "ActivateSession",
-    (GDBusArgInfo **) &_login1_manager_method_info_activate_session_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_activate_session_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -893,7 +893,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_activate_sessi
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_activate_session_on_seat_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_activate_session_on_seat_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -904,7 +904,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_activate_session_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_activate_session_on_seat_IN_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_activate_session_on_seat_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -915,19 +915,19 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_activate_session_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_activate_session_on_seat_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_activate_session_on_seat_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_activate_session_on_seat_IN_ARG_unnamed_arg0,
-  &_login1_manager_method_info_activate_session_on_seat_IN_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_activate_session_on_seat_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_activate_session_on_seat_IN_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_activate_session_on_seat =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_activate_session_on_seat =
 {
   {
     -1,
     (gchar *) "ActivateSessionOnSeat",
-    (GDBusArgInfo **) &_login1_manager_method_info_activate_session_on_seat_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_activate_session_on_seat_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -935,7 +935,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_activate_sessi
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_lock_session_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_lock_session_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -946,13 +946,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_lock_session_IN_A
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_lock_session_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_lock_session_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_lock_session_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_lock_session_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_lock_session_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_lock_session_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -960,26 +960,26 @@ static const GDBusAnnotationInfo _login1_manager_method_lock_session_annotation_
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_lock_session_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_lock_session_annotation_info_pointers[] =
 {
-  &_login1_manager_method_lock_session_annotation_info_0,
+  &_logind_login1_manager_method_lock_session_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_lock_session =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_lock_session =
 {
   {
     -1,
     (gchar *) "LockSession",
-    (GDBusArgInfo **) &_login1_manager_method_info_lock_session_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_lock_session_IN_ARG_pointers,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_lock_session_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_lock_session_annotation_info_pointers
   },
   "handle-lock-session",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_unlock_session_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_unlock_session_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -990,13 +990,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_unlock_session_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_unlock_session_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_unlock_session_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_unlock_session_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_unlock_session_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_unlock_session_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_unlock_session_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -1004,26 +1004,26 @@ static const GDBusAnnotationInfo _login1_manager_method_unlock_session_annotatio
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_unlock_session_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_unlock_session_annotation_info_pointers[] =
 {
-  &_login1_manager_method_unlock_session_annotation_info_0,
+  &_logind_login1_manager_method_unlock_session_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_unlock_session =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_unlock_session =
 {
   {
     -1,
     (gchar *) "UnlockSession",
-    (GDBusArgInfo **) &_login1_manager_method_info_unlock_session_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_unlock_session_IN_ARG_pointers,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_unlock_session_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_unlock_session_annotation_info_pointers
   },
   "handle-unlock-session",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_lock_sessions_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_lock_sessions_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -1031,26 +1031,26 @@ static const GDBusAnnotationInfo _login1_manager_method_lock_sessions_annotation
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_lock_sessions_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_lock_sessions_annotation_info_pointers[] =
 {
-  &_login1_manager_method_lock_sessions_annotation_info_0,
+  &_logind_login1_manager_method_lock_sessions_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_lock_sessions =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_lock_sessions =
 {
   {
     -1,
     (gchar *) "LockSessions",
     NULL,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_lock_sessions_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_lock_sessions_annotation_info_pointers
   },
   "handle-lock-sessions",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_unlock_sessions_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_unlock_sessions_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -1058,26 +1058,26 @@ static const GDBusAnnotationInfo _login1_manager_method_unlock_sessions_annotati
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_unlock_sessions_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_unlock_sessions_annotation_info_pointers[] =
 {
-  &_login1_manager_method_unlock_sessions_annotation_info_0,
+  &_logind_login1_manager_method_unlock_sessions_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_unlock_sessions =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_unlock_sessions =
 {
   {
     -1,
     (gchar *) "UnlockSessions",
     NULL,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_unlock_sessions_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_unlock_sessions_annotation_info_pointers
   },
   "handle-unlock-sessions",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_session_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_kill_session_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1088,7 +1088,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_session_IN_A
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_session_IN_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_kill_session_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -1099,7 +1099,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_session_IN_A
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_session_IN_ARG_unnamed_arg2 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_kill_session_IN_ARG_unnamed_arg2 =
 {
   {
     -1,
@@ -1110,15 +1110,15 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_session_IN_A
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_kill_session_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_kill_session_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_kill_session_IN_ARG_unnamed_arg0,
-  &_login1_manager_method_info_kill_session_IN_ARG_unnamed_arg1,
-  &_login1_manager_method_info_kill_session_IN_ARG_unnamed_arg2,
+  &_logind_login1_manager_method_info_kill_session_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_kill_session_IN_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_kill_session_IN_ARG_unnamed_arg2,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_kill_session_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_kill_session_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -1126,26 +1126,26 @@ static const GDBusAnnotationInfo _login1_manager_method_kill_session_annotation_
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_kill_session_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_kill_session_annotation_info_pointers[] =
 {
-  &_login1_manager_method_kill_session_annotation_info_0,
+  &_logind_login1_manager_method_kill_session_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_kill_session =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_kill_session =
 {
   {
     -1,
     (gchar *) "KillSession",
-    (GDBusArgInfo **) &_login1_manager_method_info_kill_session_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_kill_session_IN_ARG_pointers,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_kill_session_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_kill_session_annotation_info_pointers
   },
   "handle-kill-session",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_user_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_kill_user_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1156,7 +1156,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_user_IN_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_user_IN_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_kill_user_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -1167,14 +1167,14 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_kill_user_IN_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_kill_user_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_kill_user_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_kill_user_IN_ARG_unnamed_arg0,
-  &_login1_manager_method_info_kill_user_IN_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_kill_user_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_kill_user_IN_ARG_unnamed_arg1,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_kill_user_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_kill_user_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -1182,26 +1182,26 @@ static const GDBusAnnotationInfo _login1_manager_method_kill_user_annotation_inf
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_kill_user_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_kill_user_annotation_info_pointers[] =
 {
-  &_login1_manager_method_kill_user_annotation_info_0,
+  &_logind_login1_manager_method_kill_user_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_kill_user =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_kill_user =
 {
   {
     -1,
     (gchar *) "KillUser",
-    (GDBusArgInfo **) &_login1_manager_method_info_kill_user_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_kill_user_IN_ARG_pointers,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_kill_user_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_kill_user_annotation_info_pointers
   },
   "handle-kill-user",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_terminate_session_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_terminate_session_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1212,13 +1212,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_terminate_session
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_terminate_session_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_terminate_session_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_terminate_session_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_terminate_session_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_terminate_session_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_terminate_session_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -1226,26 +1226,26 @@ static const GDBusAnnotationInfo _login1_manager_method_terminate_session_annota
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_terminate_session_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_terminate_session_annotation_info_pointers[] =
 {
-  &_login1_manager_method_terminate_session_annotation_info_0,
+  &_logind_login1_manager_method_terminate_session_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_terminate_session =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_terminate_session =
 {
   {
     -1,
     (gchar *) "TerminateSession",
-    (GDBusArgInfo **) &_login1_manager_method_info_terminate_session_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_terminate_session_IN_ARG_pointers,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_terminate_session_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_terminate_session_annotation_info_pointers
   },
   "handle-terminate-session",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_terminate_user_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_terminate_user_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1256,13 +1256,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_terminate_user_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_terminate_user_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_terminate_user_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_terminate_user_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_terminate_user_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_terminate_user_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_terminate_user_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -1270,26 +1270,26 @@ static const GDBusAnnotationInfo _login1_manager_method_terminate_user_annotatio
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_terminate_user_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_terminate_user_annotation_info_pointers[] =
 {
-  &_login1_manager_method_terminate_user_annotation_info_0,
+  &_logind_login1_manager_method_terminate_user_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_terminate_user =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_terminate_user =
 {
   {
     -1,
     (gchar *) "TerminateUser",
-    (GDBusArgInfo **) &_login1_manager_method_info_terminate_user_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_terminate_user_IN_ARG_pointers,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_terminate_user_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_terminate_user_annotation_info_pointers
   },
   "handle-terminate-user",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_terminate_seat_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_terminate_seat_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1300,13 +1300,13 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_terminate_seat_IN
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_terminate_seat_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_terminate_seat_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_terminate_seat_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_terminate_seat_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_method_terminate_seat_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_method_terminate_seat_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.systemd1.Privileged",
@@ -1314,26 +1314,26 @@ static const GDBusAnnotationInfo _login1_manager_method_terminate_seat_annotatio
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_method_terminate_seat_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_method_terminate_seat_annotation_info_pointers[] =
 {
-  &_login1_manager_method_terminate_seat_annotation_info_0,
+  &_logind_login1_manager_method_terminate_seat_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_terminate_seat =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_terminate_seat =
 {
   {
     -1,
     (gchar *) "TerminateSeat",
-    (GDBusArgInfo **) &_login1_manager_method_info_terminate_seat_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_terminate_seat_IN_ARG_pointers,
     NULL,
-    (GDBusAnnotationInfo **) &_login1_manager_method_terminate_seat_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_method_terminate_seat_annotation_info_pointers
   },
   "handle-terminate-seat",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1344,7 +1344,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_set_user_linger_I
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -1355,7 +1355,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_set_user_linger_I
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg2 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg2 =
 {
   {
     -1,
@@ -1366,20 +1366,20 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_set_user_linger_I
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_set_user_linger_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_set_user_linger_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg0,
-  &_login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg1,
-  &_login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg2,
+  &_logind_login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_set_user_linger_IN_ARG_unnamed_arg2,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_set_user_linger =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_set_user_linger =
 {
   {
     -1,
     (gchar *) "SetUserLinger",
-    (GDBusArgInfo **) &_login1_manager_method_info_set_user_linger_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_set_user_linger_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -1387,7 +1387,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_set_user_linge
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_attach_device_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_attach_device_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1398,7 +1398,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_attach_device_IN_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_attach_device_IN_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_attach_device_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -1409,7 +1409,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_attach_device_IN_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_attach_device_IN_ARG_unnamed_arg2 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_attach_device_IN_ARG_unnamed_arg2 =
 {
   {
     -1,
@@ -1420,20 +1420,20 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_attach_device_IN_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_attach_device_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_attach_device_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_attach_device_IN_ARG_unnamed_arg0,
-  &_login1_manager_method_info_attach_device_IN_ARG_unnamed_arg1,
-  &_login1_manager_method_info_attach_device_IN_ARG_unnamed_arg2,
+  &_logind_login1_manager_method_info_attach_device_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_attach_device_IN_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_attach_device_IN_ARG_unnamed_arg2,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_attach_device =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_attach_device =
 {
   {
     -1,
     (gchar *) "AttachDevice",
-    (GDBusArgInfo **) &_login1_manager_method_info_attach_device_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_attach_device_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -1441,7 +1441,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_attach_device
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_flush_devices_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_flush_devices_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1452,18 +1452,18 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_flush_devices_IN_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_flush_devices_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_flush_devices_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_flush_devices_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_flush_devices_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_flush_devices =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_flush_devices =
 {
   {
     -1,
     (gchar *) "FlushDevices",
-    (GDBusArgInfo **) &_login1_manager_method_info_flush_devices_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_flush_devices_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -1471,7 +1471,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_flush_devices
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_power_off_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_power_off_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1482,18 +1482,18 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_power_off_IN_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_power_off_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_power_off_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_power_off_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_power_off_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_power_off =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_power_off =
 {
   {
     -1,
     (gchar *) "PowerOff",
-    (GDBusArgInfo **) &_login1_manager_method_info_power_off_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_power_off_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -1501,7 +1501,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_power_off =
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_reboot_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_reboot_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1512,18 +1512,18 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_reboot_IN_ARG_unn
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_reboot_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_reboot_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_reboot_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_reboot_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_reboot =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_reboot =
 {
   {
     -1,
     (gchar *) "Reboot",
-    (GDBusArgInfo **) &_login1_manager_method_info_reboot_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_reboot_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -1531,7 +1531,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_reboot =
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_suspend_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_suspend_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1542,18 +1542,18 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_suspend_IN_ARG_un
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_suspend_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_suspend_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_suspend_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_suspend_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_suspend =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_suspend =
 {
   {
     -1,
     (gchar *) "Suspend",
-    (GDBusArgInfo **) &_login1_manager_method_info_suspend_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_suspend_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -1561,7 +1561,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_suspend =
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_hibernate_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_hibernate_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1572,18 +1572,18 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_hibernate_IN_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_hibernate_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_hibernate_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_hibernate_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_hibernate_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_hibernate =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_hibernate =
 {
   {
     -1,
     (gchar *) "Hibernate",
-    (GDBusArgInfo **) &_login1_manager_method_info_hibernate_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_hibernate_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -1591,7 +1591,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_hibernate =
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_hybrid_sleep_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_hybrid_sleep_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1602,18 +1602,18 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_hybrid_sleep_IN_A
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_hybrid_sleep_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_hybrid_sleep_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_hybrid_sleep_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_hybrid_sleep_IN_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_hybrid_sleep =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_hybrid_sleep =
 {
   {
     -1,
     (gchar *) "HybridSleep",
-    (GDBusArgInfo **) &_login1_manager_method_info_hybrid_sleep_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_hybrid_sleep_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -1621,7 +1621,7 @@ static const _ExtendedGDBusMethodInfo _login1_manager_method_info_hybrid_sleep =
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_power_off_OUT_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_can_power_off_OUT_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1632,26 +1632,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_power_off_OUT
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_can_power_off_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_can_power_off_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_can_power_off_OUT_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_can_power_off_OUT_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_can_power_off =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_can_power_off =
 {
   {
     -1,
     (gchar *) "CanPowerOff",
     NULL,
-    (GDBusArgInfo **) &_login1_manager_method_info_can_power_off_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_can_power_off_OUT_ARG_pointers,
     NULL
   },
   "handle-can-power-off",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_reboot_OUT_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_can_reboot_OUT_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1662,26 +1662,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_reboot_OUT_AR
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_can_reboot_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_can_reboot_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_can_reboot_OUT_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_can_reboot_OUT_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_can_reboot =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_can_reboot =
 {
   {
     -1,
     (gchar *) "CanReboot",
     NULL,
-    (GDBusArgInfo **) &_login1_manager_method_info_can_reboot_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_can_reboot_OUT_ARG_pointers,
     NULL
   },
   "handle-can-reboot",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_suspend_OUT_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_can_suspend_OUT_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1692,26 +1692,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_suspend_OUT_A
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_can_suspend_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_can_suspend_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_can_suspend_OUT_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_can_suspend_OUT_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_can_suspend =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_can_suspend =
 {
   {
     -1,
     (gchar *) "CanSuspend",
     NULL,
-    (GDBusArgInfo **) &_login1_manager_method_info_can_suspend_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_can_suspend_OUT_ARG_pointers,
     NULL
   },
   "handle-can-suspend",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_hibernate_OUT_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_can_hibernate_OUT_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1722,26 +1722,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_hibernate_OUT
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_can_hibernate_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_can_hibernate_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_can_hibernate_OUT_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_can_hibernate_OUT_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_can_hibernate =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_can_hibernate =
 {
   {
     -1,
     (gchar *) "CanHibernate",
     NULL,
-    (GDBusArgInfo **) &_login1_manager_method_info_can_hibernate_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_can_hibernate_OUT_ARG_pointers,
     NULL
   },
   "handle-can-hibernate",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_hybrid_sleep_OUT_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_can_hybrid_sleep_OUT_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1752,26 +1752,26 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_can_hybrid_sleep_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_can_hybrid_sleep_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_can_hybrid_sleep_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_can_hybrid_sleep_OUT_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_can_hybrid_sleep_OUT_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_can_hybrid_sleep =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_can_hybrid_sleep =
 {
   {
     -1,
     (gchar *) "CanHybridSleep",
     NULL,
-    (GDBusArgInfo **) &_login1_manager_method_info_can_hybrid_sleep_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_can_hybrid_sleep_OUT_ARG_pointers,
     NULL
   },
   "handle-can-hybrid-sleep",
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_IN_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1782,7 +1782,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_IN_ARG_un
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_IN_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -1793,7 +1793,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_IN_ARG_un
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_IN_ARG_unnamed_arg2 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg2 =
 {
   {
     -1,
@@ -1804,7 +1804,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_IN_ARG_un
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_IN_ARG_unnamed_arg3 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg3 =
 {
   {
     -1,
@@ -1815,16 +1815,16 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_IN_ARG_un
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_inhibit_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_inhibit_IN_ARG_pointers[] =
 {
-  &_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg0,
-  &_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg1,
-  &_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg2,
-  &_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg3,
+  &_logind_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg0,
+  &_logind_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg1,
+  &_logind_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg2,
+  &_logind_login1_manager_method_info_inhibit_IN_ARG_unnamed_arg3,
   NULL
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_OUT_ARG_unnamed_arg4 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_method_info_inhibit_OUT_ARG_unnamed_arg4 =
 {
   {
     -1,
@@ -1835,67 +1835,67 @@ static const _ExtendedGDBusArgInfo _login1_manager_method_info_inhibit_OUT_ARG_u
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_method_info_inhibit_OUT_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_method_info_inhibit_OUT_ARG_pointers[] =
 {
-  &_login1_manager_method_info_inhibit_OUT_ARG_unnamed_arg4,
+  &_logind_login1_manager_method_info_inhibit_OUT_ARG_unnamed_arg4,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _login1_manager_method_info_inhibit =
+static const _ExtendedGDBusMethodInfo _logind_login1_manager_method_info_inhibit =
 {
   {
     -1,
     (gchar *) "Inhibit",
-    (GDBusArgInfo **) &_login1_manager_method_info_inhibit_IN_ARG_pointers,
-    (GDBusArgInfo **) &_login1_manager_method_info_inhibit_OUT_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_inhibit_IN_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_method_info_inhibit_OUT_ARG_pointers,
     NULL
   },
   "handle-inhibit",
   FALSE
 };
 
-static const _ExtendedGDBusMethodInfo * const _login1_manager_method_info_pointers[] =
-{
-  &_login1_manager_method_info_get_session,
-  &_login1_manager_method_info_get_session_by_pid,
-  &_login1_manager_method_info_get_user,
-  &_login1_manager_method_info_get_user_by_pid,
-  &_login1_manager_method_info_get_seat,
-  &_login1_manager_method_info_list_sessions,
-  &_login1_manager_method_info_list_users,
-  &_login1_manager_method_info_list_seats,
-  &_login1_manager_method_info_list_inhibitors,
-  &_login1_manager_method_info_create_session,
-  &_login1_manager_method_info_release_session,
-  &_login1_manager_method_info_activate_session,
-  &_login1_manager_method_info_activate_session_on_seat,
-  &_login1_manager_method_info_lock_session,
-  &_login1_manager_method_info_unlock_session,
-  &_login1_manager_method_info_lock_sessions,
-  &_login1_manager_method_info_unlock_sessions,
-  &_login1_manager_method_info_kill_session,
-  &_login1_manager_method_info_kill_user,
-  &_login1_manager_method_info_terminate_session,
-  &_login1_manager_method_info_terminate_user,
-  &_login1_manager_method_info_terminate_seat,
-  &_login1_manager_method_info_set_user_linger,
-  &_login1_manager_method_info_attach_device,
-  &_login1_manager_method_info_flush_devices,
-  &_login1_manager_method_info_power_off,
-  &_login1_manager_method_info_reboot,
-  &_login1_manager_method_info_suspend,
-  &_login1_manager_method_info_hibernate,
-  &_login1_manager_method_info_hybrid_sleep,
-  &_login1_manager_method_info_can_power_off,
-  &_login1_manager_method_info_can_reboot,
-  &_login1_manager_method_info_can_suspend,
-  &_login1_manager_method_info_can_hibernate,
-  &_login1_manager_method_info_can_hybrid_sleep,
-  &_login1_manager_method_info_inhibit,
+static const _ExtendedGDBusMethodInfo * const _logind_login1_manager_method_info_pointers[] =
+{
+  &_logind_login1_manager_method_info_get_session,
+  &_logind_login1_manager_method_info_get_session_by_pid,
+  &_logind_login1_manager_method_info_get_user,
+  &_logind_login1_manager_method_info_get_user_by_pid,
+  &_logind_login1_manager_method_info_get_seat,
+  &_logind_login1_manager_method_info_list_sessions,
+  &_logind_login1_manager_method_info_list_users,
+  &_logind_login1_manager_method_info_list_seats,
+  &_logind_login1_manager_method_info_list_inhibitors,
+  &_logind_login1_manager_method_info_create_session,
+  &_logind_login1_manager_method_info_release_session,
+  &_logind_login1_manager_method_info_activate_session,
+  &_logind_login1_manager_method_info_activate_session_on_seat,
+  &_logind_login1_manager_method_info_lock_session,
+  &_logind_login1_manager_method_info_unlock_session,
+  &_logind_login1_manager_method_info_lock_sessions,
+  &_logind_login1_manager_method_info_unlock_sessions,
+  &_logind_login1_manager_method_info_kill_session,
+  &_logind_login1_manager_method_info_kill_user,
+  &_logind_login1_manager_method_info_terminate_session,
+  &_logind_login1_manager_method_info_terminate_user,
+  &_logind_login1_manager_method_info_terminate_seat,
+  &_logind_login1_manager_method_info_set_user_linger,
+  &_logind_login1_manager_method_info_attach_device,
+  &_logind_login1_manager_method_info_flush_devices,
+  &_logind_login1_manager_method_info_power_off,
+  &_logind_login1_manager_method_info_reboot,
+  &_logind_login1_manager_method_info_suspend,
+  &_logind_login1_manager_method_info_hibernate,
+  &_logind_login1_manager_method_info_hybrid_sleep,
+  &_logind_login1_manager_method_info_can_power_off,
+  &_logind_login1_manager_method_info_can_reboot,
+  &_logind_login1_manager_method_info_can_suspend,
+  &_logind_login1_manager_method_info_can_hibernate,
+  &_logind_login1_manager_method_info_can_hybrid_sleep,
+  &_logind_login1_manager_method_info_inhibit,
   NULL
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_session_new_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_session_new_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1906,7 +1906,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_session_new_ARG_u
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_session_new_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_session_new_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -1917,25 +1917,25 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_session_new_ARG_u
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_signal_info_session_new_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_signal_info_session_new_ARG_pointers[] =
 {
-  &_login1_manager_signal_info_session_new_ARG_unnamed_arg0,
-  &_login1_manager_signal_info_session_new_ARG_unnamed_arg1,
+  &_logind_login1_manager_signal_info_session_new_ARG_unnamed_arg0,
+  &_logind_login1_manager_signal_info_session_new_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusSignalInfo _login1_manager_signal_info_session_new =
+static const _ExtendedGDBusSignalInfo _logind_login1_manager_signal_info_session_new =
 {
   {
     -1,
     (gchar *) "SessionNew",
-    (GDBusArgInfo **) &_login1_manager_signal_info_session_new_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_signal_info_session_new_ARG_pointers,
     NULL
   },
   "session-new"
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_session_removed_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_session_removed_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1946,7 +1946,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_session_removed_A
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_session_removed_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_session_removed_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -1957,25 +1957,25 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_session_removed_A
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_signal_info_session_removed_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_signal_info_session_removed_ARG_pointers[] =
 {
-  &_login1_manager_signal_info_session_removed_ARG_unnamed_arg0,
-  &_login1_manager_signal_info_session_removed_ARG_unnamed_arg1,
+  &_logind_login1_manager_signal_info_session_removed_ARG_unnamed_arg0,
+  &_logind_login1_manager_signal_info_session_removed_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusSignalInfo _login1_manager_signal_info_session_removed =
+static const _ExtendedGDBusSignalInfo _logind_login1_manager_signal_info_session_removed =
 {
   {
     -1,
     (gchar *) "SessionRemoved",
-    (GDBusArgInfo **) &_login1_manager_signal_info_session_removed_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_signal_info_session_removed_ARG_pointers,
     NULL
   },
   "session-removed"
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_user_new_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_user_new_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -1986,7 +1986,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_user_new_ARG_unna
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_user_new_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_user_new_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -1997,25 +1997,25 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_user_new_ARG_unna
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_signal_info_user_new_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_signal_info_user_new_ARG_pointers[] =
 {
-  &_login1_manager_signal_info_user_new_ARG_unnamed_arg0,
-  &_login1_manager_signal_info_user_new_ARG_unnamed_arg1,
+  &_logind_login1_manager_signal_info_user_new_ARG_unnamed_arg0,
+  &_logind_login1_manager_signal_info_user_new_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusSignalInfo _login1_manager_signal_info_user_new =
+static const _ExtendedGDBusSignalInfo _logind_login1_manager_signal_info_user_new =
 {
   {
     -1,
     (gchar *) "UserNew",
-    (GDBusArgInfo **) &_login1_manager_signal_info_user_new_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_signal_info_user_new_ARG_pointers,
     NULL
   },
   "user-new"
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_user_removed_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_user_removed_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -2026,7 +2026,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_user_removed_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_user_removed_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_user_removed_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -2037,25 +2037,25 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_user_removed_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_signal_info_user_removed_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_signal_info_user_removed_ARG_pointers[] =
 {
-  &_login1_manager_signal_info_user_removed_ARG_unnamed_arg0,
-  &_login1_manager_signal_info_user_removed_ARG_unnamed_arg1,
+  &_logind_login1_manager_signal_info_user_removed_ARG_unnamed_arg0,
+  &_logind_login1_manager_signal_info_user_removed_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusSignalInfo _login1_manager_signal_info_user_removed =
+static const _ExtendedGDBusSignalInfo _logind_login1_manager_signal_info_user_removed =
 {
   {
     -1,
     (gchar *) "UserRemoved",
-    (GDBusArgInfo **) &_login1_manager_signal_info_user_removed_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_signal_info_user_removed_ARG_pointers,
     NULL
   },
   "user-removed"
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_seat_new_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_seat_new_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -2066,7 +2066,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_seat_new_ARG_unna
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_seat_new_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_seat_new_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -2077,25 +2077,25 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_seat_new_ARG_unna
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_signal_info_seat_new_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_signal_info_seat_new_ARG_pointers[] =
 {
-  &_login1_manager_signal_info_seat_new_ARG_unnamed_arg0,
-  &_login1_manager_signal_info_seat_new_ARG_unnamed_arg1,
+  &_logind_login1_manager_signal_info_seat_new_ARG_unnamed_arg0,
+  &_logind_login1_manager_signal_info_seat_new_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusSignalInfo _login1_manager_signal_info_seat_new =
+static const _ExtendedGDBusSignalInfo _logind_login1_manager_signal_info_seat_new =
 {
   {
     -1,
     (gchar *) "SeatNew",
-    (GDBusArgInfo **) &_login1_manager_signal_info_seat_new_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_signal_info_seat_new_ARG_pointers,
     NULL
   },
   "seat-new"
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_seat_removed_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_seat_removed_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -2106,7 +2106,7 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_seat_removed_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_seat_removed_ARG_unnamed_arg1 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_seat_removed_ARG_unnamed_arg1 =
 {
   {
     -1,
@@ -2117,25 +2117,25 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_seat_removed_ARG_
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_signal_info_seat_removed_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_signal_info_seat_removed_ARG_pointers[] =
 {
-  &_login1_manager_signal_info_seat_removed_ARG_unnamed_arg0,
-  &_login1_manager_signal_info_seat_removed_ARG_unnamed_arg1,
+  &_logind_login1_manager_signal_info_seat_removed_ARG_unnamed_arg0,
+  &_logind_login1_manager_signal_info_seat_removed_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusSignalInfo _login1_manager_signal_info_seat_removed =
+static const _ExtendedGDBusSignalInfo _logind_login1_manager_signal_info_seat_removed =
 {
   {
     -1,
     (gchar *) "SeatRemoved",
-    (GDBusArgInfo **) &_login1_manager_signal_info_seat_removed_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_signal_info_seat_removed_ARG_pointers,
     NULL
   },
   "seat-removed"
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_prepare_for_shutdown_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_prepare_for_shutdown_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -2146,24 +2146,24 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_prepare_for_shutd
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_signal_info_prepare_for_shutdown_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_signal_info_prepare_for_shutdown_ARG_pointers[] =
 {
-  &_login1_manager_signal_info_prepare_for_shutdown_ARG_unnamed_arg0,
+  &_logind_login1_manager_signal_info_prepare_for_shutdown_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusSignalInfo _login1_manager_signal_info_prepare_for_shutdown =
+static const _ExtendedGDBusSignalInfo _logind_login1_manager_signal_info_prepare_for_shutdown =
 {
   {
     -1,
     (gchar *) "PrepareForShutdown",
-    (GDBusArgInfo **) &_login1_manager_signal_info_prepare_for_shutdown_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_signal_info_prepare_for_shutdown_ARG_pointers,
     NULL
   },
   "prepare-for-shutdown"
 };
 
-static const _ExtendedGDBusArgInfo _login1_manager_signal_info_prepare_for_sleep_ARG_unnamed_arg0 =
+static const _ExtendedGDBusArgInfo _logind_login1_manager_signal_info_prepare_for_sleep_ARG_unnamed_arg0 =
 {
   {
     -1,
@@ -2174,37 +2174,37 @@ static const _ExtendedGDBusArgInfo _login1_manager_signal_info_prepare_for_sleep
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _login1_manager_signal_info_prepare_for_sleep_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _logind_login1_manager_signal_info_prepare_for_sleep_ARG_pointers[] =
 {
-  &_login1_manager_signal_info_prepare_for_sleep_ARG_unnamed_arg0,
+  &_logind_login1_manager_signal_info_prepare_for_sleep_ARG_unnamed_arg0,
   NULL
 };
 
-static const _ExtendedGDBusSignalInfo _login1_manager_signal_info_prepare_for_sleep =
+static const _ExtendedGDBusSignalInfo _logind_login1_manager_signal_info_prepare_for_sleep =
 {
   {
     -1,
     (gchar *) "PrepareForSleep",
-    (GDBusArgInfo **) &_login1_manager_signal_info_prepare_for_sleep_ARG_pointers,
+    (GDBusArgInfo **) &_logind_login1_manager_signal_info_prepare_for_sleep_ARG_pointers,
     NULL
   },
   "prepare-for-sleep"
 };
 
-static const _ExtendedGDBusSignalInfo * const _login1_manager_signal_info_pointers[] =
+static const _ExtendedGDBusSignalInfo * const _logind_login1_manager_signal_info_pointers[] =
 {
-  &_login1_manager_signal_info_session_new,
-  &_login1_manager_signal_info_session_removed,
-  &_login1_manager_signal_info_user_new,
-  &_login1_manager_signal_info_user_removed,
-  &_login1_manager_signal_info_seat_new,
-  &_login1_manager_signal_info_seat_removed,
-  &_login1_manager_signal_info_prepare_for_shutdown,
-  &_login1_manager_signal_info_prepare_for_sleep,
+  &_logind_login1_manager_signal_info_session_new,
+  &_logind_login1_manager_signal_info_session_removed,
+  &_logind_login1_manager_signal_info_user_new,
+  &_logind_login1_manager_signal_info_user_removed,
+  &_logind_login1_manager_signal_info_seat_new,
+  &_logind_login1_manager_signal_info_seat_removed,
+  &_logind_login1_manager_signal_info_prepare_for_shutdown,
+  &_logind_login1_manager_signal_info_prepare_for_sleep,
   NULL
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_nauto_vts_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_nauto_vts_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2212,26 +2212,26 @@ static const GDBusAnnotationInfo _login1_manager_property_nauto_vts_annotation_i
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_nauto_vts_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_nauto_vts_annotation_info_pointers[] =
 {
-  &_login1_manager_property_nauto_vts_annotation_info_0,
+  &_logind_login1_manager_property_nauto_vts_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_nauto_vts =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_nauto_vts =
 {
   {
     -1,
     (gchar *) "NAutoVTs",
     (gchar *) "u",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_nauto_vts_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_nauto_vts_annotation_info_pointers
   },
   "nauto-vts",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_kill_only_users_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_kill_only_users_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2239,26 +2239,26 @@ static const GDBusAnnotationInfo _login1_manager_property_kill_only_users_annota
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_kill_only_users_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_kill_only_users_annotation_info_pointers[] =
 {
-  &_login1_manager_property_kill_only_users_annotation_info_0,
+  &_logind_login1_manager_property_kill_only_users_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_kill_only_users =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_kill_only_users =
 {
   {
     -1,
     (gchar *) "KillOnlyUsers",
     (gchar *) "as",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_kill_only_users_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_kill_only_users_annotation_info_pointers
   },
   "kill-only-users",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_kill_exclude_users_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_kill_exclude_users_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2266,26 +2266,26 @@ static const GDBusAnnotationInfo _login1_manager_property_kill_exclude_users_ann
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_kill_exclude_users_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_kill_exclude_users_annotation_info_pointers[] =
 {
-  &_login1_manager_property_kill_exclude_users_annotation_info_0,
+  &_logind_login1_manager_property_kill_exclude_users_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_kill_exclude_users =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_kill_exclude_users =
 {
   {
     -1,
     (gchar *) "KillExcludeUsers",
     (gchar *) "as",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_kill_exclude_users_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_kill_exclude_users_annotation_info_pointers
   },
   "kill-exclude-users",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_kill_user_processes_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_kill_user_processes_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2293,26 +2293,26 @@ static const GDBusAnnotationInfo _login1_manager_property_kill_user_processes_an
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_kill_user_processes_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_kill_user_processes_annotation_info_pointers[] =
 {
-  &_login1_manager_property_kill_user_processes_annotation_info_0,
+  &_logind_login1_manager_property_kill_user_processes_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_kill_user_processes =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_kill_user_processes =
 {
   {
     -1,
     (gchar *) "KillUserProcesses",
     (gchar *) "b",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_kill_user_processes_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_kill_user_processes_annotation_info_pointers
   },
   "kill-user-processes",
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_idle_hint =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_idle_hint =
 {
   {
     -1,
@@ -2325,7 +2325,7 @@ static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_idle_hint
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_idle_since_hint =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_idle_since_hint =
 {
   {
     -1,
@@ -2338,7 +2338,7 @@ static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_idle_since
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_idle_since_hint_monotonic =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_idle_since_hint_monotonic =
 {
   {
     -1,
@@ -2351,7 +2351,7 @@ static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_idle_since
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_block_inhibited =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_block_inhibited =
 {
   {
     -1,
@@ -2364,7 +2364,7 @@ static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_block_inhi
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_delay_inhibited =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_delay_inhibited =
 {
   {
     -1,
@@ -2377,7 +2377,7 @@ static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_delay_inhi
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_inhibit_delay_max_usec_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_inhibit_delay_max_usec_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2385,26 +2385,26 @@ static const GDBusAnnotationInfo _login1_manager_property_inhibit_delay_max_usec
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_inhibit_delay_max_usec_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_inhibit_delay_max_usec_annotation_info_pointers[] =
 {
-  &_login1_manager_property_inhibit_delay_max_usec_annotation_info_0,
+  &_logind_login1_manager_property_inhibit_delay_max_usec_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_inhibit_delay_max_usec =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_inhibit_delay_max_usec =
 {
   {
     -1,
     (gchar *) "InhibitDelayMaxUSec",
     (gchar *) "t",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_inhibit_delay_max_usec_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_inhibit_delay_max_usec_annotation_info_pointers
   },
   "inhibit-delay-max-usec",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_handle_power_key_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_handle_power_key_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2412,26 +2412,26 @@ static const GDBusAnnotationInfo _login1_manager_property_handle_power_key_annot
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_handle_power_key_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_handle_power_key_annotation_info_pointers[] =
 {
-  &_login1_manager_property_handle_power_key_annotation_info_0,
+  &_logind_login1_manager_property_handle_power_key_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_handle_power_key =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_handle_power_key =
 {
   {
     -1,
     (gchar *) "HandlePowerKey",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_handle_power_key_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_handle_power_key_annotation_info_pointers
   },
   "handle-power-key",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_handle_suspend_key_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_handle_suspend_key_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2439,26 +2439,26 @@ static const GDBusAnnotationInfo _login1_manager_property_handle_suspend_key_ann
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_handle_suspend_key_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_handle_suspend_key_annotation_info_pointers[] =
 {
-  &_login1_manager_property_handle_suspend_key_annotation_info_0,
+  &_logind_login1_manager_property_handle_suspend_key_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_handle_suspend_key =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_handle_suspend_key =
 {
   {
     -1,
     (gchar *) "HandleSuspendKey",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_handle_suspend_key_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_handle_suspend_key_annotation_info_pointers
   },
   "handle-suspend-key",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_handle_hibernate_key_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_handle_hibernate_key_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2466,26 +2466,26 @@ static const GDBusAnnotationInfo _login1_manager_property_handle_hibernate_key_a
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_handle_hibernate_key_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_handle_hibernate_key_annotation_info_pointers[] =
 {
-  &_login1_manager_property_handle_hibernate_key_annotation_info_0,
+  &_logind_login1_manager_property_handle_hibernate_key_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_handle_hibernate_key =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_handle_hibernate_key =
 {
   {
     -1,
     (gchar *) "HandleHibernateKey",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_handle_hibernate_key_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_handle_hibernate_key_annotation_info_pointers
   },
   "handle-hibernate-key",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_handle_lid_switch_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_handle_lid_switch_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2493,26 +2493,26 @@ static const GDBusAnnotationInfo _login1_manager_property_handle_lid_switch_anno
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_handle_lid_switch_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_handle_lid_switch_annotation_info_pointers[] =
 {
-  &_login1_manager_property_handle_lid_switch_annotation_info_0,
+  &_logind_login1_manager_property_handle_lid_switch_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_handle_lid_switch =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_handle_lid_switch =
 {
   {
     -1,
     (gchar *) "HandleLidSwitch",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_handle_lid_switch_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_handle_lid_switch_annotation_info_pointers
   },
   "handle-lid-switch",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_idle_action_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_idle_action_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2520,26 +2520,26 @@ static const GDBusAnnotationInfo _login1_manager_property_idle_action_annotation
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_idle_action_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_idle_action_annotation_info_pointers[] =
 {
-  &_login1_manager_property_idle_action_annotation_info_0,
+  &_logind_login1_manager_property_idle_action_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_idle_action =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_idle_action =
 {
   {
     -1,
     (gchar *) "IdleAction",
     (gchar *) "s",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_idle_action_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_idle_action_annotation_info_pointers
   },
   "idle-action",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_idle_action_usec_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_idle_action_usec_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2547,26 +2547,26 @@ static const GDBusAnnotationInfo _login1_manager_property_idle_action_usec_annot
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_idle_action_usec_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_idle_action_usec_annotation_info_pointers[] =
 {
-  &_login1_manager_property_idle_action_usec_annotation_info_0,
+  &_logind_login1_manager_property_idle_action_usec_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_idle_action_usec =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_idle_action_usec =
 {
   {
     -1,
     (gchar *) "IdleActionUSec",
     (gchar *) "t",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_idle_action_usec_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_idle_action_usec_annotation_info_pointers
   },
   "idle-action-usec",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_preparing_for_shutdown_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_preparing_for_shutdown_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2574,26 +2574,26 @@ static const GDBusAnnotationInfo _login1_manager_property_preparing_for_shutdown
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_preparing_for_shutdown_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_preparing_for_shutdown_annotation_info_pointers[] =
 {
-  &_login1_manager_property_preparing_for_shutdown_annotation_info_0,
+  &_logind_login1_manager_property_preparing_for_shutdown_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_preparing_for_shutdown =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_preparing_for_shutdown =
 {
   {
     -1,
     (gchar *) "PreparingForShutdown",
     (gchar *) "b",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_preparing_for_shutdown_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_preparing_for_shutdown_annotation_info_pointers
   },
   "preparing-for-shutdown",
   FALSE
 };
 
-static const GDBusAnnotationInfo _login1_manager_property_preparing_for_sleep_annotation_info_0 =
+static const GDBusAnnotationInfo _logind_login1_manager_property_preparing_for_sleep_annotation_info_0 =
 {
   -1,
   (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
@@ -2601,56 +2601,56 @@ static const GDBusAnnotationInfo _login1_manager_property_preparing_for_sleep_an
   NULL
 };
 
-static const GDBusAnnotationInfo * const _login1_manager_property_preparing_for_sleep_annotation_info_pointers[] =
+static const GDBusAnnotationInfo * const _logind_login1_manager_property_preparing_for_sleep_annotation_info_pointers[] =
 {
-  &_login1_manager_property_preparing_for_sleep_annotation_info_0,
+  &_logind_login1_manager_property_preparing_for_sleep_annotation_info_0,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _login1_manager_property_info_preparing_for_sleep =
+static const _ExtendedGDBusPropertyInfo _logind_login1_manager_property_info_preparing_for_sleep =
 {
   {
     -1,
     (gchar *) "PreparingForSleep",
     (gchar *) "b",
     G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
-    (GDBusAnnotationInfo **) &_login1_manager_property_preparing_for_sleep_annotation_info_pointers
+    (GDBusAnnotationInfo **) &_logind_login1_manager_property_preparing_for_sleep_annotation_info_pointers
   },
   "preparing-for-sleep",
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo * const _login1_manager_property_info_pointers[] =
-{
-  &_login1_manager_property_info_nauto_vts,
-  &_login1_manager_property_info_kill_only_users,
-  &_login1_manager_property_info_kill_exclude_users,
-  &_login1_manager_property_info_kill_user_processes,
-  &_login1_manager_property_info_idle_hint,
-  &_login1_manager_property_info_idle_since_hint,
-  &_login1_manager_property_info_idle_since_hint_monotonic,
-  &_login1_manager_property_info_block_inhibited,
-  &_login1_manager_property_info_delay_inhibited,
-  &_login1_manager_property_info_inhibit_delay_max_usec,
-  &_login1_manager_property_info_handle_power_key,
-  &_login1_manager_property_info_handle_suspend_key,
-  &_login1_manager_property_info_handle_hibernate_key,
-  &_login1_manager_property_info_handle_lid_switch,
-  &_login1_manager_property_info_idle_action,
-  &_login1_manager_property_info_idle_action_usec,
-  &_login1_manager_property_info_preparing_for_shutdown,
-  &_login1_manager_property_info_preparing_for_sleep,
+static const _ExtendedGDBusPropertyInfo * const _logind_login1_manager_property_info_pointers[] =
+{
+  &_logind_login1_manager_property_info_nauto_vts,
+  &_logind_login1_manager_property_info_kill_only_users,
+  &_logind_login1_manager_property_info_kill_exclude_users,
+  &_logind_login1_manager_property_info_kill_user_processes,
+  &_logind_login1_manager_property_info_idle_hint,
+  &_logind_login1_manager_property_info_idle_since_hint,
+  &_logind_login1_manager_property_info_idle_since_hint_monotonic,
+  &_logind_login1_manager_property_info_block_inhibited,
+  &_logind_login1_manager_property_info_delay_inhibited,
+  &_logind_login1_manager_property_info_inhibit_delay_max_usec,
+  &_logind_login1_manager_property_info_handle_power_key,
+  &_logind_login1_manager_property_info_handle_suspend_key,
+  &_logind_login1_manager_property_info_handle_hibernate_key,
+  &_logind_login1_manager_property_info_handle_lid_switch,
+  &_logind_login1_manager_property_info_idle_action,
+  &_logind_login1_manager_property_info_idle_action_usec,
+  &_logind_login1_manager_property_info_preparing_for_shutdown,
+  &_logind_login1_manager_property_info_preparing_for_sleep,
   NULL
 };
 
-static const _ExtendedGDBusInterfaceInfo _login1_manager_interface_info =
+static const _ExtendedGDBusInterfaceInfo _logind_login1_manager_interface_info =
 {
   {
     -1,
     (gchar *) "org.freedesktop.login1.Manager",
-    (GDBusMethodInfo **) &_login1_manager_method_info_pointers,
-    (GDBusSignalInfo **) &_login1_manager_signal_info_pointers,
-    (GDBusPropertyInfo **) &_login1_manager_property_info_pointers,
+    (GDBusMethodInfo **) &_logind_login1_manager_method_info_pointers,
+    (GDBusSignalInfo **) &_logind_login1_manager_signal_info_pointers,
+    (GDBusPropertyInfo **) &_logind_login1_manager_property_info_pointers,
     NULL
   },
   "login1-manager",
@@ -2658,30 +2658,30 @@ static const _ExtendedGDBusInterfaceInfo _login1_manager_interface_info =
 
 
 /**
- * login1_manager_interface_info:
+ * logind_login1_manager_interface_info:
  *
  * Gets a machine-readable description of the <link linkend="gdbus-interface-org-freedesktop-login1-Manager.top_of_page">org.freedesktop.login1.Manager</link> D-Bus interface.
  *
  * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
  */
 GDBusInterfaceInfo *
-login1_manager_interface_info (void)
+logind_login1_manager_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_login1_manager_interface_info.parent_struct;
+  return (GDBusInterfaceInfo *) &_logind_login1_manager_interface_info.parent_struct;
 }
 
 /**
- * login1_manager_override_properties:
+ * logind_login1_manager_override_properties:
  * @klass: The class structure for a #GObject<!-- -->-derived class.
  * @property_id_begin: The property id to assign to the first overridden property.
  *
- * Overrides all #GObject properties in the #Login1Manager interface for a concrete class.
+ * Overrides all #GObject properties in the #logindLogin1Manager interface for a concrete class.
  * The properties are overridden in the order they are defined.
  *
  * Returns: The last property id.
  */
 guint
-login1_manager_override_properties (GObjectClass *klass, guint property_id_begin)
+logind_login1_manager_override_properties (GObjectClass *klass, guint property_id_begin)
 {
   g_object_class_override_property (klass, property_id_begin++, "nauto-vts");
   g_object_class_override_property (klass, property_id_begin++, "kill-only-users");
@@ -2707,103 +2707,103 @@ login1_manager_override_properties (GObjectClass *klass, guint property_id_begin
 
 
 /**
- * Login1Manager:
+ * logindLogin1Manager:
  *
  * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-login1-Manager.top_of_page">org.freedesktop.login1.Manager</link>.
  */
 
 /**
- * Login1ManagerIface:
+ * logindLogin1ManagerIface:
  * @parent_iface: The parent interface.
- * @handle_activate_session: Handler for the #Login1Manager::handle-activate-session signal.
- * @handle_activate_session_on_seat: Handler for the #Login1Manager::handle-activate-session-on-seat signal.
- * @handle_attach_device: Handler for the #Login1Manager::handle-attach-device signal.
- * @handle_can_hibernate: Handler for the #Login1Manager::handle-can-hibernate signal.
- * @handle_can_hybrid_sleep: Handler for the #Login1Manager::handle-can-hybrid-sleep signal.
- * @handle_can_power_off: Handler for the #Login1Manager::handle-can-power-off signal.
- * @handle_can_reboot: Handler for the #Login1Manager::handle-can-reboot signal.
- * @handle_can_suspend: Handler for the #Login1Manager::handle-can-suspend signal.
- * @handle_create_session: Handler for the #Login1Manager::handle-create-session signal.
- * @handle_flush_devices: Handler for the #Login1Manager::handle-flush-devices signal.
- * @handle_get_seat: Handler for the #Login1Manager::handle-get-seat signal.
- * @handle_get_session: Handler for the #Login1Manager::handle-get-session signal.
- * @handle_get_session_by_pid: Handler for the #Login1Manager::handle-get-session-by-pid signal.
- * @handle_get_user: Handler for the #Login1Manager::handle-get-user signal.
- * @handle_get_user_by_pid: Handler for the #Login1Manager::handle-get-user-by-pid signal.
- * @handle_hibernate: Handler for the #Login1Manager::handle-hibernate signal.
- * @handle_hybrid_sleep: Handler for the #Login1Manager::handle-hybrid-sleep signal.
- * @handle_inhibit: Handler for the #Login1Manager::handle-inhibit signal.
- * @handle_kill_session: Handler for the #Login1Manager::handle-kill-session signal.
- * @handle_kill_user: Handler for the #Login1Manager::handle-kill-user signal.
- * @handle_list_inhibitors: Handler for the #Login1Manager::handle-list-inhibitors signal.
- * @handle_list_seats: Handler for the #Login1Manager::handle-list-seats signal.
- * @handle_list_sessions: Handler for the #Login1Manager::handle-list-sessions signal.
- * @handle_list_users: Handler for the #Login1Manager::handle-list-users signal.
- * @handle_lock_session: Handler for the #Login1Manager::handle-lock-session signal.
- * @handle_lock_sessions: Handler for the #Login1Manager::handle-lock-sessions signal.
- * @handle_power_off: Handler for the #Login1Manager::handle-power-off signal.
- * @handle_reboot: Handler for the #Login1Manager::handle-reboot signal.
- * @handle_release_session: Handler for the #Login1Manager::handle-release-session signal.
- * @handle_set_user_linger: Handler for the #Login1Manager::handle-set-user-linger signal.
- * @handle_suspend: Handler for the #Login1Manager::handle-suspend signal.
- * @handle_terminate_seat: Handler for the #Login1Manager::handle-terminate-seat signal.
- * @handle_terminate_session: Handler for the #Login1Manager::handle-terminate-session signal.
- * @handle_terminate_user: Handler for the #Login1Manager::handle-terminate-user signal.
- * @handle_unlock_session: Handler for the #Login1Manager::handle-unlock-session signal.
- * @handle_unlock_sessions: Handler for the #Login1Manager::handle-unlock-sessions signal.
- * @get_block_inhibited: Getter for the #Login1Manager:block-inhibited property.
- * @get_delay_inhibited: Getter for the #Login1Manager:delay-inhibited property.
- * @get_handle_hibernate_key: Getter for the #Login1Manager:handle-hibernate-key property.
- * @get_handle_lid_switch: Getter for the #Login1Manager:handle-lid-switch property.
- * @get_handle_power_key: Getter for the #Login1Manager:handle-power-key property.
- * @get_handle_suspend_key: Getter for the #Login1Manager:handle-suspend-key property.
- * @get_idle_action: Getter for the #Login1Manager:idle-action property.
- * @get_idle_action_usec: Getter for the #Login1Manager:idle-action-usec property.
- * @get_idle_hint: Getter for the #Login1Manager:idle-hint property.
- * @get_idle_since_hint: Getter for the #Login1Manager:idle-since-hint property.
- * @get_idle_since_hint_monotonic: Getter for the #Login1Manager:idle-since-hint-monotonic property.
- * @get_inhibit_delay_max_usec: Getter for the #Login1Manager:inhibit-delay-max-usec property.
- * @get_kill_exclude_users: Getter for the #Login1Manager:kill-exclude-users property.
- * @get_kill_only_users: Getter for the #Login1Manager:kill-only-users property.
- * @get_kill_user_processes: Getter for the #Login1Manager:kill-user-processes property.
- * @get_nauto_vts: Getter for the #Login1Manager:nauto-vts property.
- * @get_preparing_for_shutdown: Getter for the #Login1Manager:preparing-for-shutdown property.
- * @get_preparing_for_sleep: Getter for the #Login1Manager:preparing-for-sleep property.
- * @prepare_for_shutdown: Handler for the #Login1Manager::prepare-for-shutdown signal.
- * @prepare_for_sleep: Handler for the #Login1Manager::prepare-for-sleep signal.
- * @seat_new: Handler for the #Login1Manager::seat-new signal.
- * @seat_removed: Handler for the #Login1Manager::seat-removed signal.
- * @session_new: Handler for the #Login1Manager::session-new signal.
- * @session_removed: Handler for the #Login1Manager::session-removed signal.
- * @user_new: Handler for the #Login1Manager::user-new signal.
- * @user_removed: Handler for the #Login1Manager::user-removed signal.
+ * @handle_activate_session: Handler for the #logindLogin1Manager::handle-activate-session signal.
+ * @handle_activate_session_on_seat: Handler for the #logindLogin1Manager::handle-activate-session-on-seat signal.
+ * @handle_attach_device: Handler for the #logindLogin1Manager::handle-attach-device signal.
+ * @handle_can_hibernate: Handler for the #logindLogin1Manager::handle-can-hibernate signal.
+ * @handle_can_hybrid_sleep: Handler for the #logindLogin1Manager::handle-can-hybrid-sleep signal.
+ * @handle_can_power_off: Handler for the #logindLogin1Manager::handle-can-power-off signal.
+ * @handle_can_reboot: Handler for the #logindLogin1Manager::handle-can-reboot signal.
+ * @handle_can_suspend: Handler for the #logindLogin1Manager::handle-can-suspend signal.
+ * @handle_create_session: Handler for the #logindLogin1Manager::handle-create-session signal.
+ * @handle_flush_devices: Handler for the #logindLogin1Manager::handle-flush-devices signal.
+ * @handle_get_seat: Handler for the #logindLogin1Manager::handle-get-seat signal.
+ * @handle_get_session: Handler for the #logindLogin1Manager::handle-get-session signal.
+ * @handle_get_session_by_pid: Handler for the #logindLogin1Manager::handle-get-session-by-pid signal.
+ * @handle_get_user: Handler for the #logindLogin1Manager::handle-get-user signal.
+ * @handle_get_user_by_pid: Handler for the #logindLogin1Manager::handle-get-user-by-pid signal.
+ * @handle_hibernate: Handler for the #logindLogin1Manager::handle-hibernate signal.
+ * @handle_hybrid_sleep: Handler for the #logindLogin1Manager::handle-hybrid-sleep signal.
+ * @handle_inhibit: Handler for the #logindLogin1Manager::handle-inhibit signal.
+ * @handle_kill_session: Handler for the #logindLogin1Manager::handle-kill-session signal.
+ * @handle_kill_user: Handler for the #logindLogin1Manager::handle-kill-user signal.
+ * @handle_list_inhibitors: Handler for the #logindLogin1Manager::handle-list-inhibitors signal.
+ * @handle_list_seats: Handler for the #logindLogin1Manager::handle-list-seats signal.
+ * @handle_list_sessions: Handler for the #logindLogin1Manager::handle-list-sessions signal.
+ * @handle_list_users: Handler for the #logindLogin1Manager::handle-list-users signal.
+ * @handle_lock_session: Handler for the #logindLogin1Manager::handle-lock-session signal.
+ * @handle_lock_sessions: Handler for the #logindLogin1Manager::handle-lock-sessions signal.
+ * @handle_power_off: Handler for the #logindLogin1Manager::handle-power-off signal.
+ * @handle_reboot: Handler for the #logindLogin1Manager::handle-reboot signal.
+ * @handle_release_session: Handler for the #logindLogin1Manager::handle-release-session signal.
+ * @handle_set_user_linger: Handler for the #logindLogin1Manager::handle-set-user-linger signal.
+ * @handle_suspend: Handler for the #logindLogin1Manager::handle-suspend signal.
+ * @handle_terminate_seat: Handler for the #logindLogin1Manager::handle-terminate-seat signal.
+ * @handle_terminate_session: Handler for the #logindLogin1Manager::handle-terminate-session signal.
+ * @handle_terminate_user: Handler for the #logindLogin1Manager::handle-terminate-user signal.
+ * @handle_unlock_session: Handler for the #logindLogin1Manager::handle-unlock-session signal.
+ * @handle_unlock_sessions: Handler for the #logindLogin1Manager::handle-unlock-sessions signal.
+ * @get_block_inhibited: Getter for the #logindLogin1Manager:block-inhibited property.
+ * @get_delay_inhibited: Getter for the #logindLogin1Manager:delay-inhibited property.
+ * @get_handle_hibernate_key: Getter for the #logindLogin1Manager:handle-hibernate-key property.
+ * @get_handle_lid_switch: Getter for the #logindLogin1Manager:handle-lid-switch property.
+ * @get_handle_power_key: Getter for the #logindLogin1Manager:handle-power-key property.
+ * @get_handle_suspend_key: Getter for the #logindLogin1Manager:handle-suspend-key property.
+ * @get_idle_action: Getter for the #logindLogin1Manager:idle-action property.
+ * @get_idle_action_usec: Getter for the #logindLogin1Manager:idle-action-usec property.
+ * @get_idle_hint: Getter for the #logindLogin1Manager:idle-hint property.
+ * @get_idle_since_hint: Getter for the #logindLogin1Manager:idle-since-hint property.
+ * @get_idle_since_hint_monotonic: Getter for the #logindLogin1Manager:idle-since-hint-monotonic property.
+ * @get_inhibit_delay_max_usec: Getter for the #logindLogin1Manager:inhibit-delay-max-usec property.
+ * @get_kill_exclude_users: Getter for the #logindLogin1Manager:kill-exclude-users property.
+ * @get_kill_only_users: Getter for the #logindLogin1Manager:kill-only-users property.
+ * @get_kill_user_processes: Getter for the #logindLogin1Manager:kill-user-processes property.
+ * @get_nauto_vts: Getter for the #logindLogin1Manager:nauto-vts property.
+ * @get_preparing_for_shutdown: Getter for the #logindLogin1Manager:preparing-for-shutdown property.
+ * @get_preparing_for_sleep: Getter for the #logindLogin1Manager:preparing-for-sleep property.
+ * @prepare_for_shutdown: Handler for the #logindLogin1Manager::prepare-for-shutdown signal.
+ * @prepare_for_sleep: Handler for the #logindLogin1Manager::prepare-for-sleep signal.
+ * @seat_new: Handler for the #logindLogin1Manager::seat-new signal.
+ * @seat_removed: Handler for the #logindLogin1Manager::seat-removed signal.
+ * @session_new: Handler for the #logindLogin1Manager::session-new signal.
+ * @session_removed: Handler for the #logindLogin1Manager::session-removed signal.
+ * @user_new: Handler for the #logindLogin1Manager::user-new signal.
+ * @user_removed: Handler for the #logindLogin1Manager::user-removed signal.
  *
  * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-login1-Manager.top_of_page">org.freedesktop.login1.Manager</link>.
  */
 
-typedef Login1ManagerIface Login1ManagerInterface;
-G_DEFINE_INTERFACE (Login1Manager, login1_manager, G_TYPE_OBJECT);
+typedef logindLogin1ManagerIface logindLogin1ManagerInterface;
+G_DEFINE_INTERFACE (logindLogin1Manager, logind_login1_manager, G_TYPE_OBJECT);
 
 static void
-login1_manager_default_init (Login1ManagerIface *iface)
+logind_login1_manager_default_init (logindLogin1ManagerIface *iface)
 {
   /* GObject signals for incoming D-Bus method calls: */
   /**
-   * Login1Manager::handle-get-session:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-get-session:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetSession">GetSession()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_get_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_get_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-get-session",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_get_session),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_get_session),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -2812,21 +2812,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
 
   /**
-   * Login1Manager::handle-get-session-by-pid:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-get-session-by-pid:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetSessionByPID">GetSessionByPID()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_get_session_by_pid() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_get_session_by_pid() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-get-session-by-pid",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_get_session_by_pid),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_get_session_by_pid),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -2835,21 +2835,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT);
 
   /**
-   * Login1Manager::handle-get-user:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-get-user:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetUser">GetUser()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_get_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_get_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-get-user",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_get_user),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_get_user),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -2858,21 +2858,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT);
 
   /**
-   * Login1Manager::handle-get-user-by-pid:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-get-user-by-pid:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetUserByPID">GetUserByPID()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_get_user_by_pid() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_get_user_by_pid() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-get-user-by-pid",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_get_user_by_pid),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_get_user_by_pid),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -2881,21 +2881,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT);
 
   /**
-   * Login1Manager::handle-get-seat:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-get-seat:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetSeat">GetSeat()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_get_seat() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_get_seat() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-get-seat",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_get_seat),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_get_seat),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -2904,20 +2904,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
 
   /**
-   * Login1Manager::handle-list-sessions:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-list-sessions:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListSessions">ListSessions()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_list_sessions() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_list_sessions() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-list-sessions",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_list_sessions),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_list_sessions),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -2926,20 +2926,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-list-users:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-list-users:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListUsers">ListUsers()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_list_users() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_list_users() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-list-users",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_list_users),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_list_users),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -2948,20 +2948,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-list-seats:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-list-seats:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListSeats">ListSeats()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_list_seats() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_list_seats() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-list-seats",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_list_seats),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_list_seats),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -2970,20 +2970,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-list-inhibitors:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-list-inhibitors:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListInhibitors">ListInhibitors()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_list_inhibitors() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_list_inhibitors() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-list-inhibitors",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_list_inhibitors),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_list_inhibitors),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -2992,8 +2992,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-create-session:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-create-session:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    * @arg_unnamed_arg1: Argument passed by remote caller.
@@ -3012,14 +3012,14 @@ login1_manager_default_init (Login1ManagerIface *iface)
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CreateSession">CreateSession()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_create_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_create_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-create-session",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_create_session),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_create_session),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3028,21 +3028,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_VARIANT);
 
   /**
-   * Login1Manager::handle-release-session:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-release-session:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ReleaseSession">ReleaseSession()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_release_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_release_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-release-session",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_release_session),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_release_session),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3051,21 +3051,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
 
   /**
-   * Login1Manager::handle-activate-session:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-activate-session:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ActivateSession">ActivateSession()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_activate_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_activate_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-activate-session",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_activate_session),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_activate_session),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3074,22 +3074,22 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
 
   /**
-   * Login1Manager::handle-activate-session-on-seat:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-activate-session-on-seat:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    * @arg_unnamed_arg1: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ActivateSessionOnSeat">ActivateSessionOnSeat()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_activate_session_on_seat() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_activate_session_on_seat() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-activate-session-on-seat",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_activate_session_on_seat),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_activate_session_on_seat),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3098,21 +3098,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING);
 
   /**
-   * Login1Manager::handle-lock-session:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-lock-session:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.LockSession">LockSession()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_lock_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_lock_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-lock-session",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_lock_session),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_lock_session),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3121,21 +3121,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
 
   /**
-   * Login1Manager::handle-unlock-session:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-unlock-session:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.UnlockSession">UnlockSession()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_unlock_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_unlock_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-unlock-session",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_unlock_session),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_unlock_session),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3144,20 +3144,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
 
   /**
-   * Login1Manager::handle-lock-sessions:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-lock-sessions:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.LockSessions">LockSessions()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_lock_sessions() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_lock_sessions() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-lock-sessions",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_lock_sessions),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_lock_sessions),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3166,20 +3166,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-unlock-sessions:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-unlock-sessions:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.UnlockSessions">UnlockSessions()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_unlock_sessions() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_unlock_sessions() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-unlock-sessions",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_unlock_sessions),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_unlock_sessions),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3188,8 +3188,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-kill-session:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-kill-session:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    * @arg_unnamed_arg1: Argument passed by remote caller.
@@ -3197,14 +3197,14 @@ login1_manager_default_init (Login1ManagerIface *iface)
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.KillSession">KillSession()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_kill_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_kill_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-kill-session",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_kill_session),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_kill_session),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3213,22 +3213,22 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
 
   /**
-   * Login1Manager::handle-kill-user:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-kill-user:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    * @arg_unnamed_arg1: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.KillUser">KillUser()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_kill_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_kill_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-kill-user",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_kill_user),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_kill_user),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3237,21 +3237,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT, G_TYPE_INT);
 
   /**
-   * Login1Manager::handle-terminate-session:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-terminate-session:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateSession">TerminateSession()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_terminate_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_terminate_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-terminate-session",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_terminate_session),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_terminate_session),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3260,21 +3260,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
 
   /**
-   * Login1Manager::handle-terminate-user:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-terminate-user:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateUser">TerminateUser()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_terminate_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_terminate_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-terminate-user",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_terminate_user),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_terminate_user),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3283,21 +3283,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT);
 
   /**
-   * Login1Manager::handle-terminate-seat:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-terminate-seat:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateSeat">TerminateSeat()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_terminate_seat() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_terminate_seat() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-terminate-seat",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_terminate_seat),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_terminate_seat),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3306,8 +3306,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING);
 
   /**
-   * Login1Manager::handle-set-user-linger:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-set-user-linger:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    * @arg_unnamed_arg1: Argument passed by remote caller.
@@ -3315,14 +3315,14 @@ login1_manager_default_init (Login1ManagerIface *iface)
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.SetUserLinger">SetUserLinger()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_set_user_linger() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_set_user_linger() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-set-user-linger",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_set_user_linger),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_set_user_linger),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3331,8 +3331,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 
   /**
-   * Login1Manager::handle-attach-device:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-attach-device:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    * @arg_unnamed_arg1: Argument passed by remote caller.
@@ -3340,14 +3340,14 @@ login1_manager_default_init (Login1ManagerIface *iface)
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.AttachDevice">AttachDevice()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_attach_device() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_attach_device() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-attach-device",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_attach_device),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_attach_device),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3356,21 +3356,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
   /**
-   * Login1Manager::handle-flush-devices:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-flush-devices:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.FlushDevices">FlushDevices()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_flush_devices() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_flush_devices() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-flush-devices",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_flush_devices),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_flush_devices),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3379,21 +3379,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_BOOLEAN);
 
   /**
-   * Login1Manager::handle-power-off:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-power-off:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.PowerOff">PowerOff()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_power_off() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_power_off() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-power-off",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_power_off),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_power_off),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3402,21 +3402,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_BOOLEAN);
 
   /**
-   * Login1Manager::handle-reboot:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-reboot:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Reboot">Reboot()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_reboot() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_reboot() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-reboot",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_reboot),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_reboot),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3425,21 +3425,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_BOOLEAN);
 
   /**
-   * Login1Manager::handle-suspend:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-suspend:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Suspend">Suspend()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_suspend() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_suspend() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-suspend",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_suspend),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_suspend),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3448,21 +3448,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_BOOLEAN);
 
   /**
-   * Login1Manager::handle-hibernate:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-hibernate:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Hibernate">Hibernate()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_hibernate() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_hibernate() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-hibernate",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_hibernate),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_hibernate),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3471,21 +3471,21 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_BOOLEAN);
 
   /**
-   * Login1Manager::handle-hybrid-sleep:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-hybrid-sleep:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.HybridSleep">HybridSleep()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_hybrid_sleep() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_hybrid_sleep() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-hybrid-sleep",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_hybrid_sleep),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_hybrid_sleep),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3494,20 +3494,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_BOOLEAN);
 
   /**
-   * Login1Manager::handle-can-power-off:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-can-power-off:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanPowerOff">CanPowerOff()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_can_power_off() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_can_power_off() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-can-power-off",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_can_power_off),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_can_power_off),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3516,20 +3516,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-can-reboot:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-can-reboot:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanReboot">CanReboot()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_can_reboot() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_can_reboot() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-can-reboot",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_can_reboot),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_can_reboot),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3538,20 +3538,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-can-suspend:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-can-suspend:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanSuspend">CanSuspend()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_can_suspend() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_can_suspend() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-can-suspend",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_can_suspend),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_can_suspend),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3560,20 +3560,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-can-hibernate:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-can-hibernate:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanHibernate">CanHibernate()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_can_hibernate() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_can_hibernate() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-can-hibernate",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_can_hibernate),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_can_hibernate),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3582,20 +3582,20 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-can-hybrid-sleep:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-can-hybrid-sleep:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanHybridSleep">CanHybridSleep()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_can_hybrid_sleep() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_can_hybrid_sleep() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-can-hybrid-sleep",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_can_hybrid_sleep),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_can_hybrid_sleep),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3604,8 +3604,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION);
 
   /**
-   * Login1Manager::handle-inhibit:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::handle-inhibit:
+   * @object: A #logindLogin1Manager.
    * @invocation: A #GDBusMethodInvocation.
    * @arg_unnamed_arg0: Argument passed by remote caller.
    * @arg_unnamed_arg1: Argument passed by remote caller.
@@ -3614,14 +3614,14 @@ login1_manager_default_init (Login1ManagerIface *iface)
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Inhibit">Inhibit()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call login1_manager_complete_inhibit() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call logind_login1_manager_complete_inhibit() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-inhibit",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, handle_inhibit),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, handle_inhibit),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -3631,8 +3631,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
 
   /* GObject signals for received D-Bus signals: */
   /**
-   * Login1Manager::session-new:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::session-new:
+   * @object: A #logindLogin1Manager.
    * @arg_unnamed_arg0: Argument.
    * @arg_unnamed_arg1: Argument.
    *
@@ -3643,7 +3643,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_signal_new ("session-new",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, session_new),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, session_new),
     NULL,
     NULL,
     g_cclosure_marshal_generic,
@@ -3651,8 +3651,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     2, G_TYPE_STRING, G_TYPE_STRING);
 
   /**
-   * Login1Manager::session-removed:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::session-removed:
+   * @object: A #logindLogin1Manager.
    * @arg_unnamed_arg0: Argument.
    * @arg_unnamed_arg1: Argument.
    *
@@ -3663,7 +3663,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_signal_new ("session-removed",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, session_removed),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, session_removed),
     NULL,
     NULL,
     g_cclosure_marshal_generic,
@@ -3671,8 +3671,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     2, G_TYPE_STRING, G_TYPE_STRING);
 
   /**
-   * Login1Manager::user-new:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::user-new:
+   * @object: A #logindLogin1Manager.
    * @arg_unnamed_arg0: Argument.
    * @arg_unnamed_arg1: Argument.
    *
@@ -3683,7 +3683,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_signal_new ("user-new",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, user_new),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, user_new),
     NULL,
     NULL,
     g_cclosure_marshal_generic,
@@ -3691,8 +3691,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     2, G_TYPE_UINT, G_TYPE_STRING);
 
   /**
-   * Login1Manager::user-removed:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::user-removed:
+   * @object: A #logindLogin1Manager.
    * @arg_unnamed_arg0: Argument.
    * @arg_unnamed_arg1: Argument.
    *
@@ -3703,7 +3703,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_signal_new ("user-removed",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, user_removed),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, user_removed),
     NULL,
     NULL,
     g_cclosure_marshal_generic,
@@ -3711,8 +3711,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     2, G_TYPE_UINT, G_TYPE_STRING);
 
   /**
-   * Login1Manager::seat-new:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::seat-new:
+   * @object: A #logindLogin1Manager.
    * @arg_unnamed_arg0: Argument.
    * @arg_unnamed_arg1: Argument.
    *
@@ -3723,7 +3723,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_signal_new ("seat-new",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, seat_new),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, seat_new),
     NULL,
     NULL,
     g_cclosure_marshal_generic,
@@ -3731,8 +3731,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     2, G_TYPE_STRING, G_TYPE_STRING);
 
   /**
-   * Login1Manager::seat-removed:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::seat-removed:
+   * @object: A #logindLogin1Manager.
    * @arg_unnamed_arg0: Argument.
    * @arg_unnamed_arg1: Argument.
    *
@@ -3743,7 +3743,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_signal_new ("seat-removed",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, seat_removed),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, seat_removed),
     NULL,
     NULL,
     g_cclosure_marshal_generic,
@@ -3751,8 +3751,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     2, G_TYPE_STRING, G_TYPE_STRING);
 
   /**
-   * Login1Manager::prepare-for-shutdown:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::prepare-for-shutdown:
+   * @object: A #logindLogin1Manager.
    * @arg_unnamed_arg0: Argument.
    *
    * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-freedesktop-login1-Manager.PrepareForShutdown">"PrepareForShutdown"</link> is received.
@@ -3762,7 +3762,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_signal_new ("prepare-for-shutdown",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, prepare_for_shutdown),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, prepare_for_shutdown),
     NULL,
     NULL,
     g_cclosure_marshal_generic,
@@ -3770,8 +3770,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
     1, G_TYPE_BOOLEAN);
 
   /**
-   * Login1Manager::prepare-for-sleep:
-   * @object: A #Login1Manager.
+   * logindLogin1Manager::prepare-for-sleep:
+   * @object: A #logindLogin1Manager.
    * @arg_unnamed_arg0: Argument.
    *
    * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-freedesktop-login1-Manager.PrepareForSleep">"PrepareForSleep"</link> is received.
@@ -3781,7 +3781,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_signal_new ("prepare-for-sleep",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Login1ManagerIface, prepare_for_sleep),
+    G_STRUCT_OFFSET (logindLogin1ManagerIface, prepare_for_sleep),
     NULL,
     NULL,
     g_cclosure_marshal_generic,
@@ -3790,7 +3790,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
 
   /* GObject properties for D-Bus properties: */
   /**
-   * Login1Manager:nauto-vts:
+   * logindLogin1Manager:nauto-vts:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.NAutoVTs">"NAutoVTs"</link>.
    *
@@ -3799,7 +3799,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_uint ("nauto-vts", "NAutoVTs", "NAutoVTs", 0, G_MAXUINT32, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:kill-only-users:
+   * logindLogin1Manager:kill-only-users:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillOnlyUsers">"KillOnlyUsers"</link>.
    *
@@ -3808,7 +3808,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_boxed ("kill-only-users", "KillOnlyUsers", "KillOnlyUsers", G_TYPE_STRV, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:kill-exclude-users:
+   * logindLogin1Manager:kill-exclude-users:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillExcludeUsers">"KillExcludeUsers"</link>.
    *
@@ -3817,7 +3817,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_boxed ("kill-exclude-users", "KillExcludeUsers", "KillExcludeUsers", G_TYPE_STRV, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:kill-user-processes:
+   * logindLogin1Manager:kill-user-processes:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillUserProcesses">"KillUserProcesses"</link>.
    *
@@ -3826,7 +3826,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_boolean ("kill-user-processes", "KillUserProcesses", "KillUserProcesses", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:idle-hint:
+   * logindLogin1Manager:idle-hint:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleHint">"IdleHint"</link>.
    *
@@ -3835,7 +3835,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_boolean ("idle-hint", "IdleHint", "IdleHint", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:idle-since-hint:
+   * logindLogin1Manager:idle-since-hint:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleSinceHint">"IdleSinceHint"</link>.
    *
@@ -3844,7 +3844,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_uint64 ("idle-since-hint", "IdleSinceHint", "IdleSinceHint", 0, G_MAXUINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:idle-since-hint-monotonic:
+   * logindLogin1Manager:idle-since-hint-monotonic:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleSinceHintMonotonic">"IdleSinceHintMonotonic"</link>.
    *
@@ -3853,7 +3853,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_uint64 ("idle-since-hint-monotonic", "IdleSinceHintMonotonic", "IdleSinceHintMonotonic", 0, G_MAXUINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:block-inhibited:
+   * logindLogin1Manager:block-inhibited:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.BlockInhibited">"BlockInhibited"</link>.
    *
@@ -3862,7 +3862,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_string ("block-inhibited", "BlockInhibited", "BlockInhibited", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:delay-inhibited:
+   * logindLogin1Manager:delay-inhibited:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.DelayInhibited">"DelayInhibited"</link>.
    *
@@ -3871,7 +3871,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_string ("delay-inhibited", "DelayInhibited", "DelayInhibited", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:inhibit-delay-max-usec:
+   * logindLogin1Manager:inhibit-delay-max-usec:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.InhibitDelayMaxUSec">"InhibitDelayMaxUSec"</link>.
    *
@@ -3880,7 +3880,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_uint64 ("inhibit-delay-max-usec", "InhibitDelayMaxUSec", "InhibitDelayMaxUSec", 0, G_MAXUINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:handle-power-key:
+   * logindLogin1Manager:handle-power-key:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandlePowerKey">"HandlePowerKey"</link>.
    *
@@ -3889,7 +3889,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_string ("handle-power-key", "HandlePowerKey", "HandlePowerKey", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:handle-suspend-key:
+   * logindLogin1Manager:handle-suspend-key:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleSuspendKey">"HandleSuspendKey"</link>.
    *
@@ -3898,7 +3898,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_string ("handle-suspend-key", "HandleSuspendKey", "HandleSuspendKey", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:handle-hibernate-key:
+   * logindLogin1Manager:handle-hibernate-key:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleHibernateKey">"HandleHibernateKey"</link>.
    *
@@ -3907,7 +3907,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_string ("handle-hibernate-key", "HandleHibernateKey", "HandleHibernateKey", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:handle-lid-switch:
+   * logindLogin1Manager:handle-lid-switch:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleLidSwitch">"HandleLidSwitch"</link>.
    *
@@ -3916,7 +3916,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_string ("handle-lid-switch", "HandleLidSwitch", "HandleLidSwitch", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:idle-action:
+   * logindLogin1Manager:idle-action:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleAction">"IdleAction"</link>.
    *
@@ -3925,7 +3925,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_string ("idle-action", "IdleAction", "IdleAction", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:idle-action-usec:
+   * logindLogin1Manager:idle-action-usec:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleActionUSec">"IdleActionUSec"</link>.
    *
@@ -3934,7 +3934,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_uint64 ("idle-action-usec", "IdleActionUSec", "IdleActionUSec", 0, G_MAXUINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:preparing-for-shutdown:
+   * logindLogin1Manager:preparing-for-shutdown:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.PreparingForShutdown">"PreparingForShutdown"</link>.
    *
@@ -3943,7 +3943,7 @@ login1_manager_default_init (Login1ManagerIface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_boolean ("preparing-for-shutdown", "PreparingForShutdown", "PreparingForShutdown", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Login1Manager:preparing-for-sleep:
+   * logindLogin1Manager:preparing-for-sleep:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-login1-Manager.PreparingForSleep">"PreparingForSleep"</link>.
    *
@@ -3954,8 +3954,8 @@ login1_manager_default_init (Login1ManagerIface *iface)
 }
 
 /**
- * login1_manager_get_nauto_vts: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_nauto_vts: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.NAutoVTs">"NAutoVTs"</link> D-Bus property.
  *
@@ -3964,14 +3964,14 @@ login1_manager_default_init (Login1ManagerIface *iface)
  * Returns: The property value.
  */
 guint 
-login1_manager_get_nauto_vts (Login1Manager *object)
+logind_login1_manager_get_nauto_vts (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_nauto_vts (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_nauto_vts (object);
 }
 
 /**
- * login1_manager_set_nauto_vts: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_nauto_vts: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.NAutoVTs">"NAutoVTs"</link> D-Bus property to @value.
@@ -3979,32 +3979,32 @@ login1_manager_get_nauto_vts (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_nauto_vts (Login1Manager *object, guint value)
+logind_login1_manager_set_nauto_vts (logindLogin1Manager *object, guint value)
 {
   g_object_set (G_OBJECT (object), "nauto-vts", value, NULL);
 }
 
 /**
- * login1_manager_get_kill_only_users: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_kill_only_users: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillOnlyUsers">"KillOnlyUsers"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use login1_manager_dup_kill_only_users() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use logind_login1_manager_dup_kill_only_users() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *const *
-login1_manager_get_kill_only_users (Login1Manager *object)
+logind_login1_manager_get_kill_only_users (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_kill_only_users (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_kill_only_users (object);
 }
 
 /**
- * login1_manager_dup_kill_only_users: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_dup_kill_only_users: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillOnlyUsers">"KillOnlyUsers"</link> D-Bus property.
  *
@@ -4013,7 +4013,7 @@ login1_manager_get_kill_only_users (Login1Manager *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_strfreev().
  */
 gchar **
-login1_manager_dup_kill_only_users (Login1Manager *object)
+logind_login1_manager_dup_kill_only_users (logindLogin1Manager *object)
 {
   gchar **value;
   g_object_get (G_OBJECT (object), "kill-only-users", &value, NULL);
@@ -4021,8 +4021,8 @@ login1_manager_dup_kill_only_users (Login1Manager *object)
 }
 
 /**
- * login1_manager_set_kill_only_users: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_kill_only_users: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillOnlyUsers">"KillOnlyUsers"</link> D-Bus property to @value.
@@ -4030,32 +4030,32 @@ login1_manager_dup_kill_only_users (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_kill_only_users (Login1Manager *object, const gchar *const *value)
+logind_login1_manager_set_kill_only_users (logindLogin1Manager *object, const gchar *const *value)
 {
   g_object_set (G_OBJECT (object), "kill-only-users", value, NULL);
 }
 
 /**
- * login1_manager_get_kill_exclude_users: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_kill_exclude_users: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillExcludeUsers">"KillExcludeUsers"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use login1_manager_dup_kill_exclude_users() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use logind_login1_manager_dup_kill_exclude_users() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *const *
-login1_manager_get_kill_exclude_users (Login1Manager *object)
+logind_login1_manager_get_kill_exclude_users (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_kill_exclude_users (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_kill_exclude_users (object);
 }
 
 /**
- * login1_manager_dup_kill_exclude_users: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_dup_kill_exclude_users: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillExcludeUsers">"KillExcludeUsers"</link> D-Bus property.
  *
@@ -4064,7 +4064,7 @@ login1_manager_get_kill_exclude_users (Login1Manager *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_strfreev().
  */
 gchar **
-login1_manager_dup_kill_exclude_users (Login1Manager *object)
+logind_login1_manager_dup_kill_exclude_users (logindLogin1Manager *object)
 {
   gchar **value;
   g_object_get (G_OBJECT (object), "kill-exclude-users", &value, NULL);
@@ -4072,8 +4072,8 @@ login1_manager_dup_kill_exclude_users (Login1Manager *object)
 }
 
 /**
- * login1_manager_set_kill_exclude_users: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_kill_exclude_users: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillExcludeUsers">"KillExcludeUsers"</link> D-Bus property to @value.
@@ -4081,14 +4081,14 @@ login1_manager_dup_kill_exclude_users (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_kill_exclude_users (Login1Manager *object, const gchar *const *value)
+logind_login1_manager_set_kill_exclude_users (logindLogin1Manager *object, const gchar *const *value)
 {
   g_object_set (G_OBJECT (object), "kill-exclude-users", value, NULL);
 }
 
 /**
- * login1_manager_get_kill_user_processes: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_kill_user_processes: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillUserProcesses">"KillUserProcesses"</link> D-Bus property.
  *
@@ -4097,14 +4097,14 @@ login1_manager_set_kill_exclude_users (Login1Manager *object, const gchar *const
  * Returns: The property value.
  */
 gboolean 
-login1_manager_get_kill_user_processes (Login1Manager *object)
+logind_login1_manager_get_kill_user_processes (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_kill_user_processes (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_kill_user_processes (object);
 }
 
 /**
- * login1_manager_set_kill_user_processes: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_kill_user_processes: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.KillUserProcesses">"KillUserProcesses"</link> D-Bus property to @value.
@@ -4112,14 +4112,14 @@ login1_manager_get_kill_user_processes (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_kill_user_processes (Login1Manager *object, gboolean value)
+logind_login1_manager_set_kill_user_processes (logindLogin1Manager *object, gboolean value)
 {
   g_object_set (G_OBJECT (object), "kill-user-processes", value, NULL);
 }
 
 /**
- * login1_manager_get_idle_hint: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_idle_hint: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleHint">"IdleHint"</link> D-Bus property.
  *
@@ -4128,14 +4128,14 @@ login1_manager_set_kill_user_processes (Login1Manager *object, gboolean value)
  * Returns: The property value.
  */
 gboolean 
-login1_manager_get_idle_hint (Login1Manager *object)
+logind_login1_manager_get_idle_hint (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_idle_hint (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_idle_hint (object);
 }
 
 /**
- * login1_manager_set_idle_hint: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_idle_hint: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleHint">"IdleHint"</link> D-Bus property to @value.
@@ -4143,14 +4143,14 @@ login1_manager_get_idle_hint (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_idle_hint (Login1Manager *object, gboolean value)
+logind_login1_manager_set_idle_hint (logindLogin1Manager *object, gboolean value)
 {
   g_object_set (G_OBJECT (object), "idle-hint", value, NULL);
 }
 
 /**
- * login1_manager_get_idle_since_hint: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_idle_since_hint: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleSinceHint">"IdleSinceHint"</link> D-Bus property.
  *
@@ -4159,14 +4159,14 @@ login1_manager_set_idle_hint (Login1Manager *object, gboolean value)
  * Returns: The property value.
  */
 guint64 
-login1_manager_get_idle_since_hint (Login1Manager *object)
+logind_login1_manager_get_idle_since_hint (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_idle_since_hint (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_idle_since_hint (object);
 }
 
 /**
- * login1_manager_set_idle_since_hint: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_idle_since_hint: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleSinceHint">"IdleSinceHint"</link> D-Bus property to @value.
@@ -4174,14 +4174,14 @@ login1_manager_get_idle_since_hint (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_idle_since_hint (Login1Manager *object, guint64 value)
+logind_login1_manager_set_idle_since_hint (logindLogin1Manager *object, guint64 value)
 {
   g_object_set (G_OBJECT (object), "idle-since-hint", value, NULL);
 }
 
 /**
- * login1_manager_get_idle_since_hint_monotonic: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_idle_since_hint_monotonic: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleSinceHintMonotonic">"IdleSinceHintMonotonic"</link> D-Bus property.
  *
@@ -4190,14 +4190,14 @@ login1_manager_set_idle_since_hint (Login1Manager *object, guint64 value)
  * Returns: The property value.
  */
 guint64 
-login1_manager_get_idle_since_hint_monotonic (Login1Manager *object)
+logind_login1_manager_get_idle_since_hint_monotonic (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_idle_since_hint_monotonic (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_idle_since_hint_monotonic (object);
 }
 
 /**
- * login1_manager_set_idle_since_hint_monotonic: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_idle_since_hint_monotonic: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleSinceHintMonotonic">"IdleSinceHintMonotonic"</link> D-Bus property to @value.
@@ -4205,32 +4205,32 @@ login1_manager_get_idle_since_hint_monotonic (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_idle_since_hint_monotonic (Login1Manager *object, guint64 value)
+logind_login1_manager_set_idle_since_hint_monotonic (logindLogin1Manager *object, guint64 value)
 {
   g_object_set (G_OBJECT (object), "idle-since-hint-monotonic", value, NULL);
 }
 
 /**
- * login1_manager_get_block_inhibited: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_block_inhibited: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.BlockInhibited">"BlockInhibited"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use login1_manager_dup_block_inhibited() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use logind_login1_manager_dup_block_inhibited() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-login1_manager_get_block_inhibited (Login1Manager *object)
+logind_login1_manager_get_block_inhibited (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_block_inhibited (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_block_inhibited (object);
 }
 
 /**
- * login1_manager_dup_block_inhibited: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_dup_block_inhibited: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.BlockInhibited">"BlockInhibited"</link> D-Bus property.
  *
@@ -4239,7 +4239,7 @@ login1_manager_get_block_inhibited (Login1Manager *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-login1_manager_dup_block_inhibited (Login1Manager *object)
+logind_login1_manager_dup_block_inhibited (logindLogin1Manager *object)
 {
   gchar *value;
   g_object_get (G_OBJECT (object), "block-inhibited", &value, NULL);
@@ -4247,8 +4247,8 @@ login1_manager_dup_block_inhibited (Login1Manager *object)
 }
 
 /**
- * login1_manager_set_block_inhibited: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_block_inhibited: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.BlockInhibited">"BlockInhibited"</link> D-Bus property to @value.
@@ -4256,32 +4256,32 @@ login1_manager_dup_block_inhibited (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_block_inhibited (Login1Manager *object, const gchar *value)
+logind_login1_manager_set_block_inhibited (logindLogin1Manager *object, const gchar *value)
 {
   g_object_set (G_OBJECT (object), "block-inhibited", value, NULL);
 }
 
 /**
- * login1_manager_get_delay_inhibited: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_delay_inhibited: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.DelayInhibited">"DelayInhibited"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use login1_manager_dup_delay_inhibited() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use logind_login1_manager_dup_delay_inhibited() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-login1_manager_get_delay_inhibited (Login1Manager *object)
+logind_login1_manager_get_delay_inhibited (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_delay_inhibited (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_delay_inhibited (object);
 }
 
 /**
- * login1_manager_dup_delay_inhibited: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_dup_delay_inhibited: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.DelayInhibited">"DelayInhibited"</link> D-Bus property.
  *
@@ -4290,7 +4290,7 @@ login1_manager_get_delay_inhibited (Login1Manager *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-login1_manager_dup_delay_inhibited (Login1Manager *object)
+logind_login1_manager_dup_delay_inhibited (logindLogin1Manager *object)
 {
   gchar *value;
   g_object_get (G_OBJECT (object), "delay-inhibited", &value, NULL);
@@ -4298,8 +4298,8 @@ login1_manager_dup_delay_inhibited (Login1Manager *object)
 }
 
 /**
- * login1_manager_set_delay_inhibited: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_delay_inhibited: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.DelayInhibited">"DelayInhibited"</link> D-Bus property to @value.
@@ -4307,14 +4307,14 @@ login1_manager_dup_delay_inhibited (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_delay_inhibited (Login1Manager *object, const gchar *value)
+logind_login1_manager_set_delay_inhibited (logindLogin1Manager *object, const gchar *value)
 {
   g_object_set (G_OBJECT (object), "delay-inhibited", value, NULL);
 }
 
 /**
- * login1_manager_get_inhibit_delay_max_usec: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_inhibit_delay_max_usec: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.InhibitDelayMaxUSec">"InhibitDelayMaxUSec"</link> D-Bus property.
  *
@@ -4323,14 +4323,14 @@ login1_manager_set_delay_inhibited (Login1Manager *object, const gchar *value)
  * Returns: The property value.
  */
 guint64 
-login1_manager_get_inhibit_delay_max_usec (Login1Manager *object)
+logind_login1_manager_get_inhibit_delay_max_usec (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_inhibit_delay_max_usec (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_inhibit_delay_max_usec (object);
 }
 
 /**
- * login1_manager_set_inhibit_delay_max_usec: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_inhibit_delay_max_usec: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.InhibitDelayMaxUSec">"InhibitDelayMaxUSec"</link> D-Bus property to @value.
@@ -4338,32 +4338,32 @@ login1_manager_get_inhibit_delay_max_usec (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_inhibit_delay_max_usec (Login1Manager *object, guint64 value)
+logind_login1_manager_set_inhibit_delay_max_usec (logindLogin1Manager *object, guint64 value)
 {
   g_object_set (G_OBJECT (object), "inhibit-delay-max-usec", value, NULL);
 }
 
 /**
- * login1_manager_get_handle_power_key: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_handle_power_key: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandlePowerKey">"HandlePowerKey"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use login1_manager_dup_handle_power_key() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use logind_login1_manager_dup_handle_power_key() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-login1_manager_get_handle_power_key (Login1Manager *object)
+logind_login1_manager_get_handle_power_key (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_handle_power_key (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_handle_power_key (object);
 }
 
 /**
- * login1_manager_dup_handle_power_key: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_dup_handle_power_key: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandlePowerKey">"HandlePowerKey"</link> D-Bus property.
  *
@@ -4372,7 +4372,7 @@ login1_manager_get_handle_power_key (Login1Manager *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-login1_manager_dup_handle_power_key (Login1Manager *object)
+logind_login1_manager_dup_handle_power_key (logindLogin1Manager *object)
 {
   gchar *value;
   g_object_get (G_OBJECT (object), "handle-power-key", &value, NULL);
@@ -4380,8 +4380,8 @@ login1_manager_dup_handle_power_key (Login1Manager *object)
 }
 
 /**
- * login1_manager_set_handle_power_key: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_handle_power_key: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandlePowerKey">"HandlePowerKey"</link> D-Bus property to @value.
@@ -4389,32 +4389,32 @@ login1_manager_dup_handle_power_key (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_handle_power_key (Login1Manager *object, const gchar *value)
+logind_login1_manager_set_handle_power_key (logindLogin1Manager *object, const gchar *value)
 {
   g_object_set (G_OBJECT (object), "handle-power-key", value, NULL);
 }
 
 /**
- * login1_manager_get_handle_suspend_key: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_handle_suspend_key: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleSuspendKey">"HandleSuspendKey"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use login1_manager_dup_handle_suspend_key() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use logind_login1_manager_dup_handle_suspend_key() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-login1_manager_get_handle_suspend_key (Login1Manager *object)
+logind_login1_manager_get_handle_suspend_key (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_handle_suspend_key (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_handle_suspend_key (object);
 }
 
 /**
- * login1_manager_dup_handle_suspend_key: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_dup_handle_suspend_key: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleSuspendKey">"HandleSuspendKey"</link> D-Bus property.
  *
@@ -4423,7 +4423,7 @@ login1_manager_get_handle_suspend_key (Login1Manager *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-login1_manager_dup_handle_suspend_key (Login1Manager *object)
+logind_login1_manager_dup_handle_suspend_key (logindLogin1Manager *object)
 {
   gchar *value;
   g_object_get (G_OBJECT (object), "handle-suspend-key", &value, NULL);
@@ -4431,8 +4431,8 @@ login1_manager_dup_handle_suspend_key (Login1Manager *object)
 }
 
 /**
- * login1_manager_set_handle_suspend_key: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_handle_suspend_key: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleSuspendKey">"HandleSuspendKey"</link> D-Bus property to @value.
@@ -4440,32 +4440,32 @@ login1_manager_dup_handle_suspend_key (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_handle_suspend_key (Login1Manager *object, const gchar *value)
+logind_login1_manager_set_handle_suspend_key (logindLogin1Manager *object, const gchar *value)
 {
   g_object_set (G_OBJECT (object), "handle-suspend-key", value, NULL);
 }
 
 /**
- * login1_manager_get_handle_hibernate_key: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_handle_hibernate_key: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleHibernateKey">"HandleHibernateKey"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use login1_manager_dup_handle_hibernate_key() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use logind_login1_manager_dup_handle_hibernate_key() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-login1_manager_get_handle_hibernate_key (Login1Manager *object)
+logind_login1_manager_get_handle_hibernate_key (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_handle_hibernate_key (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_handle_hibernate_key (object);
 }
 
 /**
- * login1_manager_dup_handle_hibernate_key: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_dup_handle_hibernate_key: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleHibernateKey">"HandleHibernateKey"</link> D-Bus property.
  *
@@ -4474,7 +4474,7 @@ login1_manager_get_handle_hibernate_key (Login1Manager *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-login1_manager_dup_handle_hibernate_key (Login1Manager *object)
+logind_login1_manager_dup_handle_hibernate_key (logindLogin1Manager *object)
 {
   gchar *value;
   g_object_get (G_OBJECT (object), "handle-hibernate-key", &value, NULL);
@@ -4482,8 +4482,8 @@ login1_manager_dup_handle_hibernate_key (Login1Manager *object)
 }
 
 /**
- * login1_manager_set_handle_hibernate_key: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_handle_hibernate_key: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleHibernateKey">"HandleHibernateKey"</link> D-Bus property to @value.
@@ -4491,32 +4491,32 @@ login1_manager_dup_handle_hibernate_key (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_handle_hibernate_key (Login1Manager *object, const gchar *value)
+logind_login1_manager_set_handle_hibernate_key (logindLogin1Manager *object, const gchar *value)
 {
   g_object_set (G_OBJECT (object), "handle-hibernate-key", value, NULL);
 }
 
 /**
- * login1_manager_get_handle_lid_switch: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_handle_lid_switch: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleLidSwitch">"HandleLidSwitch"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use login1_manager_dup_handle_lid_switch() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use logind_login1_manager_dup_handle_lid_switch() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-login1_manager_get_handle_lid_switch (Login1Manager *object)
+logind_login1_manager_get_handle_lid_switch (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_handle_lid_switch (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_handle_lid_switch (object);
 }
 
 /**
- * login1_manager_dup_handle_lid_switch: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_dup_handle_lid_switch: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleLidSwitch">"HandleLidSwitch"</link> D-Bus property.
  *
@@ -4525,7 +4525,7 @@ login1_manager_get_handle_lid_switch (Login1Manager *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-login1_manager_dup_handle_lid_switch (Login1Manager *object)
+logind_login1_manager_dup_handle_lid_switch (logindLogin1Manager *object)
 {
   gchar *value;
   g_object_get (G_OBJECT (object), "handle-lid-switch", &value, NULL);
@@ -4533,8 +4533,8 @@ login1_manager_dup_handle_lid_switch (Login1Manager *object)
 }
 
 /**
- * login1_manager_set_handle_lid_switch: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_handle_lid_switch: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.HandleLidSwitch">"HandleLidSwitch"</link> D-Bus property to @value.
@@ -4542,32 +4542,32 @@ login1_manager_dup_handle_lid_switch (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_handle_lid_switch (Login1Manager *object, const gchar *value)
+logind_login1_manager_set_handle_lid_switch (logindLogin1Manager *object, const gchar *value)
 {
   g_object_set (G_OBJECT (object), "handle-lid-switch", value, NULL);
 }
 
 /**
- * login1_manager_get_idle_action: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_idle_action: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleAction">"IdleAction"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use login1_manager_dup_idle_action() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use logind_login1_manager_dup_idle_action() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-login1_manager_get_idle_action (Login1Manager *object)
+logind_login1_manager_get_idle_action (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_idle_action (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_idle_action (object);
 }
 
 /**
- * login1_manager_dup_idle_action: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_dup_idle_action: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleAction">"IdleAction"</link> D-Bus property.
  *
@@ -4576,7 +4576,7 @@ login1_manager_get_idle_action (Login1Manager *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-login1_manager_dup_idle_action (Login1Manager *object)
+logind_login1_manager_dup_idle_action (logindLogin1Manager *object)
 {
   gchar *value;
   g_object_get (G_OBJECT (object), "idle-action", &value, NULL);
@@ -4584,8 +4584,8 @@ login1_manager_dup_idle_action (Login1Manager *object)
 }
 
 /**
- * login1_manager_set_idle_action: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_idle_action: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleAction">"IdleAction"</link> D-Bus property to @value.
@@ -4593,14 +4593,14 @@ login1_manager_dup_idle_action (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_idle_action (Login1Manager *object, const gchar *value)
+logind_login1_manager_set_idle_action (logindLogin1Manager *object, const gchar *value)
 {
   g_object_set (G_OBJECT (object), "idle-action", value, NULL);
 }
 
 /**
- * login1_manager_get_idle_action_usec: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_idle_action_usec: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleActionUSec">"IdleActionUSec"</link> D-Bus property.
  *
@@ -4609,14 +4609,14 @@ login1_manager_set_idle_action (Login1Manager *object, const gchar *value)
  * Returns: The property value.
  */
 guint64 
-login1_manager_get_idle_action_usec (Login1Manager *object)
+logind_login1_manager_get_idle_action_usec (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_idle_action_usec (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_idle_action_usec (object);
 }
 
 /**
- * login1_manager_set_idle_action_usec: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_idle_action_usec: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.IdleActionUSec">"IdleActionUSec"</link> D-Bus property to @value.
@@ -4624,14 +4624,14 @@ login1_manager_get_idle_action_usec (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_idle_action_usec (Login1Manager *object, guint64 value)
+logind_login1_manager_set_idle_action_usec (logindLogin1Manager *object, guint64 value)
 {
   g_object_set (G_OBJECT (object), "idle-action-usec", value, NULL);
 }
 
 /**
- * login1_manager_get_preparing_for_shutdown: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_preparing_for_shutdown: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.PreparingForShutdown">"PreparingForShutdown"</link> D-Bus property.
  *
@@ -4640,14 +4640,14 @@ login1_manager_set_idle_action_usec (Login1Manager *object, guint64 value)
  * Returns: The property value.
  */
 gboolean 
-login1_manager_get_preparing_for_shutdown (Login1Manager *object)
+logind_login1_manager_get_preparing_for_shutdown (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_preparing_for_shutdown (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_preparing_for_shutdown (object);
 }
 
 /**
- * login1_manager_set_preparing_for_shutdown: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_preparing_for_shutdown: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.PreparingForShutdown">"PreparingForShutdown"</link> D-Bus property to @value.
@@ -4655,14 +4655,14 @@ login1_manager_get_preparing_for_shutdown (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_preparing_for_shutdown (Login1Manager *object, gboolean value)
+logind_login1_manager_set_preparing_for_shutdown (logindLogin1Manager *object, gboolean value)
 {
   g_object_set (G_OBJECT (object), "preparing-for-shutdown", value, NULL);
 }
 
 /**
- * login1_manager_get_preparing_for_sleep: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_get_preparing_for_sleep: (skip)
+ * @object: A #logindLogin1Manager.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-login1-Manager.PreparingForSleep">"PreparingForSleep"</link> D-Bus property.
  *
@@ -4671,14 +4671,14 @@ login1_manager_set_preparing_for_shutdown (Login1Manager *object, gboolean value
  * Returns: The property value.
  */
 gboolean 
-login1_manager_get_preparing_for_sleep (Login1Manager *object)
+logind_login1_manager_get_preparing_for_sleep (logindLogin1Manager *object)
 {
-  return LOGIN1_MANAGER_GET_IFACE (object)->get_preparing_for_sleep (object);
+  return LOGIND_LOGIN1_MANAGER_GET_IFACE (object)->get_preparing_for_sleep (object);
 }
 
 /**
- * login1_manager_set_preparing_for_sleep: (skip)
- * @object: A #Login1Manager.
+ * logind_login1_manager_set_preparing_for_sleep: (skip)
+ * @object: A #logindLogin1Manager.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-login1-Manager.PreparingForSleep">"PreparingForSleep"</link> D-Bus property to @value.
@@ -4686,22 +4686,22 @@ login1_manager_get_preparing_for_sleep (Login1Manager *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-login1_manager_set_preparing_for_sleep (Login1Manager *object, gboolean value)
+logind_login1_manager_set_preparing_for_sleep (logindLogin1Manager *object, gboolean value)
 {
   g_object_set (G_OBJECT (object), "preparing-for-sleep", value, NULL);
 }
 
 /**
- * login1_manager_emit_session_new:
- * @object: A #Login1Manager.
+ * logind_login1_manager_emit_session_new:
+ * @object: A #logindLogin1Manager.
  * @arg_unnamed_arg0: Argument to pass with the signal.
  * @arg_unnamed_arg1: Argument to pass with the signal.
  *
  * Emits the <link linkend="gdbus-signal-org-freedesktop-login1-Manager.SessionNew">"SessionNew"</link> D-Bus signal.
  */
 void
-login1_manager_emit_session_new (
-    Login1Manager *object,
+logind_login1_manager_emit_session_new (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
@@ -4709,16 +4709,16 @@ login1_manager_emit_session_new (
 }
 
 /**
- * login1_manager_emit_session_removed:
- * @object: A #Login1Manager.
+ * logind_login1_manager_emit_session_removed:
+ * @object: A #logindLogin1Manager.
  * @arg_unnamed_arg0: Argument to pass with the signal.
  * @arg_unnamed_arg1: Argument to pass with the signal.
  *
  * Emits the <link linkend="gdbus-signal-org-freedesktop-login1-Manager.SessionRemoved">"SessionRemoved"</link> D-Bus signal.
  */
 void
-login1_manager_emit_session_removed (
-    Login1Manager *object,
+logind_login1_manager_emit_session_removed (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
@@ -4726,16 +4726,16 @@ login1_manager_emit_session_removed (
 }
 
 /**
- * login1_manager_emit_user_new:
- * @object: A #Login1Manager.
+ * logind_login1_manager_emit_user_new:
+ * @object: A #logindLogin1Manager.
  * @arg_unnamed_arg0: Argument to pass with the signal.
  * @arg_unnamed_arg1: Argument to pass with the signal.
  *
  * Emits the <link linkend="gdbus-signal-org-freedesktop-login1-Manager.UserNew">"UserNew"</link> D-Bus signal.
  */
 void
-login1_manager_emit_user_new (
-    Login1Manager *object,
+logind_login1_manager_emit_user_new (
+    logindLogin1Manager *object,
     guint arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
@@ -4743,16 +4743,16 @@ login1_manager_emit_user_new (
 }
 
 /**
- * login1_manager_emit_user_removed:
- * @object: A #Login1Manager.
+ * logind_login1_manager_emit_user_removed:
+ * @object: A #logindLogin1Manager.
  * @arg_unnamed_arg0: Argument to pass with the signal.
  * @arg_unnamed_arg1: Argument to pass with the signal.
  *
  * Emits the <link linkend="gdbus-signal-org-freedesktop-login1-Manager.UserRemoved">"UserRemoved"</link> D-Bus signal.
  */
 void
-login1_manager_emit_user_removed (
-    Login1Manager *object,
+logind_login1_manager_emit_user_removed (
+    logindLogin1Manager *object,
     guint arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
@@ -4760,16 +4760,16 @@ login1_manager_emit_user_removed (
 }
 
 /**
- * login1_manager_emit_seat_new:
- * @object: A #Login1Manager.
+ * logind_login1_manager_emit_seat_new:
+ * @object: A #logindLogin1Manager.
  * @arg_unnamed_arg0: Argument to pass with the signal.
  * @arg_unnamed_arg1: Argument to pass with the signal.
  *
  * Emits the <link linkend="gdbus-signal-org-freedesktop-login1-Manager.SeatNew">"SeatNew"</link> D-Bus signal.
  */
 void
-login1_manager_emit_seat_new (
-    Login1Manager *object,
+logind_login1_manager_emit_seat_new (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
@@ -4777,16 +4777,16 @@ login1_manager_emit_seat_new (
 }
 
 /**
- * login1_manager_emit_seat_removed:
- * @object: A #Login1Manager.
+ * logind_login1_manager_emit_seat_removed:
+ * @object: A #logindLogin1Manager.
  * @arg_unnamed_arg0: Argument to pass with the signal.
  * @arg_unnamed_arg1: Argument to pass with the signal.
  *
  * Emits the <link linkend="gdbus-signal-org-freedesktop-login1-Manager.SeatRemoved">"SeatRemoved"</link> D-Bus signal.
  */
 void
-login1_manager_emit_seat_removed (
-    Login1Manager *object,
+logind_login1_manager_emit_seat_removed (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
@@ -4794,38 +4794,38 @@ login1_manager_emit_seat_removed (
 }
 
 /**
- * login1_manager_emit_prepare_for_shutdown:
- * @object: A #Login1Manager.
+ * logind_login1_manager_emit_prepare_for_shutdown:
+ * @object: A #logindLogin1Manager.
  * @arg_unnamed_arg0: Argument to pass with the signal.
  *
  * Emits the <link linkend="gdbus-signal-org-freedesktop-login1-Manager.PrepareForShutdown">"PrepareForShutdown"</link> D-Bus signal.
  */
 void
-login1_manager_emit_prepare_for_shutdown (
-    Login1Manager *object,
+logind_login1_manager_emit_prepare_for_shutdown (
+    logindLogin1Manager *object,
     gboolean arg_unnamed_arg0)
 {
   g_signal_emit_by_name (object, "prepare-for-shutdown", arg_unnamed_arg0);
 }
 
 /**
- * login1_manager_emit_prepare_for_sleep:
- * @object: A #Login1Manager.
+ * logind_login1_manager_emit_prepare_for_sleep:
+ * @object: A #logindLogin1Manager.
  * @arg_unnamed_arg0: Argument to pass with the signal.
  *
  * Emits the <link linkend="gdbus-signal-org-freedesktop-login1-Manager.PrepareForSleep">"PrepareForSleep"</link> D-Bus signal.
  */
 void
-login1_manager_emit_prepare_for_sleep (
-    Login1Manager *object,
+logind_login1_manager_emit_prepare_for_sleep (
+    logindLogin1Manager *object,
     gboolean arg_unnamed_arg0)
 {
   g_signal_emit_by_name (object, "prepare-for-sleep", arg_unnamed_arg0);
 }
 
 /**
- * login1_manager_call_get_session:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_session:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -4833,13 +4833,13 @@ login1_manager_emit_prepare_for_sleep (
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetSession">GetSession()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_get_session_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_get_session_finish() to get the result of the operation.
  *
- * See login1_manager_call_get_session_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_get_session_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_get_session (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -4857,19 +4857,19 @@ login1_manager_call_get_session (
 }
 
 /**
- * login1_manager_call_get_session_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_session_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_get_session().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_get_session().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_get_session().
+ * Finishes an operation started with logind_login1_manager_call_get_session().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_session_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_session_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error)
@@ -4887,8 +4887,8 @@ _out:
 }
 
 /**
- * login1_manager_call_get_session_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_session_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
@@ -4896,13 +4896,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetSession">GetSession()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_get_session() for the asynchronous version of this method.
+ * See logind_login1_manager_call_get_session() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_session_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
@@ -4928,8 +4928,8 @@ _out:
 }
 
 /**
- * login1_manager_call_get_session_by_pid:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_session_by_pid:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -4937,13 +4937,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetSessionByPID">GetSessionByPID()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_get_session_by_pid_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_get_session_by_pid_finish() to get the result of the operation.
  *
- * See login1_manager_call_get_session_by_pid_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_get_session_by_pid_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_get_session_by_pid (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_session_by_pid (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -4961,19 +4961,19 @@ login1_manager_call_get_session_by_pid (
 }
 
 /**
- * login1_manager_call_get_session_by_pid_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_session_by_pid_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_get_session_by_pid().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_get_session_by_pid().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_get_session_by_pid().
+ * Finishes an operation started with logind_login1_manager_call_get_session_by_pid().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_session_by_pid_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_session_by_pid_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error)
@@ -4991,8 +4991,8 @@ _out:
 }
 
 /**
- * login1_manager_call_get_session_by_pid_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_session_by_pid_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
@@ -5000,13 +5000,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetSessionByPID">GetSessionByPID()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_get_session_by_pid() for the asynchronous version of this method.
+ * See logind_login1_manager_call_get_session_by_pid() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_session_by_pid_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_session_by_pid_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
@@ -5032,8 +5032,8 @@ _out:
 }
 
 /**
- * login1_manager_call_get_user:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_user:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -5041,13 +5041,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetUser">GetUser()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_get_user_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_get_user_finish() to get the result of the operation.
  *
- * See login1_manager_call_get_user_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_get_user_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_get_user (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_user (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -5065,19 +5065,19 @@ login1_manager_call_get_user (
 }
 
 /**
- * login1_manager_call_get_user_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_user_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_get_user().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_get_user().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_get_user().
+ * Finishes an operation started with logind_login1_manager_call_get_user().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_user_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_user_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error)
@@ -5095,8 +5095,8 @@ _out:
 }
 
 /**
- * login1_manager_call_get_user_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_user_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
@@ -5104,13 +5104,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetUser">GetUser()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_get_user() for the asynchronous version of this method.
+ * See logind_login1_manager_call_get_user() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_user_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_user_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
@@ -5136,8 +5136,8 @@ _out:
 }
 
 /**
- * login1_manager_call_get_user_by_pid:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_user_by_pid:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -5145,13 +5145,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetUserByPID">GetUserByPID()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_get_user_by_pid_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_get_user_by_pid_finish() to get the result of the operation.
  *
- * See login1_manager_call_get_user_by_pid_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_get_user_by_pid_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_get_user_by_pid (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_user_by_pid (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -5169,19 +5169,19 @@ login1_manager_call_get_user_by_pid (
 }
 
 /**
- * login1_manager_call_get_user_by_pid_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_user_by_pid_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_get_user_by_pid().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_get_user_by_pid().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_get_user_by_pid().
+ * Finishes an operation started with logind_login1_manager_call_get_user_by_pid().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_user_by_pid_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_user_by_pid_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error)
@@ -5199,8 +5199,8 @@ _out:
 }
 
 /**
- * login1_manager_call_get_user_by_pid_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_user_by_pid_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
@@ -5208,13 +5208,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetUserByPID">GetUserByPID()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_get_user_by_pid() for the asynchronous version of this method.
+ * See logind_login1_manager_call_get_user_by_pid() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_user_by_pid_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_user_by_pid_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
@@ -5240,8 +5240,8 @@ _out:
 }
 
 /**
- * login1_manager_call_get_seat:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_seat:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -5249,13 +5249,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetSeat">GetSeat()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_get_seat_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_get_seat_finish() to get the result of the operation.
  *
- * See login1_manager_call_get_seat_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_get_seat_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_get_seat (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_seat (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -5273,19 +5273,19 @@ login1_manager_call_get_seat (
 }
 
 /**
- * login1_manager_call_get_seat_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_seat_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_get_seat().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_get_seat().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_get_seat().
+ * Finishes an operation started with logind_login1_manager_call_get_seat().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_seat_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_seat_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error)
@@ -5303,8 +5303,8 @@ _out:
 }
 
 /**
- * login1_manager_call_get_seat_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_get_seat_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
@@ -5312,13 +5312,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.GetSeat">GetSeat()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_get_seat() for the asynchronous version of this method.
+ * See logind_login1_manager_call_get_seat() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_get_seat_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_get_seat_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
@@ -5344,21 +5344,21 @@ _out:
 }
 
 /**
- * login1_manager_call_list_sessions:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_sessions:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListSessions">ListSessions()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_list_sessions_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_list_sessions_finish() to get the result of the operation.
  *
- * See login1_manager_call_list_sessions_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_list_sessions_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_list_sessions (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_sessions (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -5374,19 +5374,19 @@ login1_manager_call_list_sessions (
 }
 
 /**
- * login1_manager_call_list_sessions_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_sessions_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_list_sessions().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_list_sessions().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_list_sessions().
+ * Finishes an operation started with logind_login1_manager_call_list_sessions().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_list_sessions_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_sessions_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error)
@@ -5404,21 +5404,21 @@ _out:
 }
 
 /**
- * login1_manager_call_list_sessions_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_sessions_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListSessions">ListSessions()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_list_sessions() for the asynchronous version of this method.
+ * See logind_login1_manager_call_list_sessions() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_list_sessions_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_sessions_sync (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -5442,21 +5442,21 @@ _out:
 }
 
 /**
- * login1_manager_call_list_users:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_users:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListUsers">ListUsers()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_list_users_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_list_users_finish() to get the result of the operation.
  *
- * See login1_manager_call_list_users_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_list_users_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_list_users (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_users (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -5472,19 +5472,19 @@ login1_manager_call_list_users (
 }
 
 /**
- * login1_manager_call_list_users_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_users_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_list_users().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_list_users().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_list_users().
+ * Finishes an operation started with logind_login1_manager_call_list_users().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_list_users_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_users_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error)
@@ -5502,21 +5502,21 @@ _out:
 }
 
 /**
- * login1_manager_call_list_users_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_users_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListUsers">ListUsers()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_list_users() for the asynchronous version of this method.
+ * See logind_login1_manager_call_list_users() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_list_users_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_users_sync (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -5540,21 +5540,21 @@ _out:
 }
 
 /**
- * login1_manager_call_list_seats:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_seats:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListSeats">ListSeats()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_list_seats_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_list_seats_finish() to get the result of the operation.
  *
- * See login1_manager_call_list_seats_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_list_seats_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_list_seats (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_seats (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -5570,19 +5570,19 @@ login1_manager_call_list_seats (
 }
 
 /**
- * login1_manager_call_list_seats_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_seats_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_list_seats().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_list_seats().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_list_seats().
+ * Finishes an operation started with logind_login1_manager_call_list_seats().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_list_seats_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_seats_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error)
@@ -5600,21 +5600,21 @@ _out:
 }
 
 /**
- * login1_manager_call_list_seats_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_seats_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListSeats">ListSeats()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_list_seats() for the asynchronous version of this method.
+ * See logind_login1_manager_call_list_seats() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_list_seats_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_seats_sync (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -5638,21 +5638,21 @@ _out:
 }
 
 /**
- * login1_manager_call_list_inhibitors:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_inhibitors:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListInhibitors">ListInhibitors()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_list_inhibitors_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_list_inhibitors_finish() to get the result of the operation.
  *
- * See login1_manager_call_list_inhibitors_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_list_inhibitors_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_list_inhibitors (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_inhibitors (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -5668,19 +5668,19 @@ login1_manager_call_list_inhibitors (
 }
 
 /**
- * login1_manager_call_list_inhibitors_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_inhibitors_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_list_inhibitors().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_list_inhibitors().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_list_inhibitors().
+ * Finishes an operation started with logind_login1_manager_call_list_inhibitors().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_list_inhibitors_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_inhibitors_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error)
@@ -5698,21 +5698,21 @@ _out:
 }
 
 /**
- * login1_manager_call_list_inhibitors_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_list_inhibitors_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ListInhibitors">ListInhibitors()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_list_inhibitors() for the asynchronous version of this method.
+ * See logind_login1_manager_call_list_inhibitors() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_list_inhibitors_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_list_inhibitors_sync (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -5736,8 +5736,8 @@ _out:
 }
 
 /**
- * login1_manager_call_create_session:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_create_session:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -5758,13 +5758,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CreateSession">CreateSession()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_create_session_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_create_session_finish() to get the result of the operation.
  *
- * See login1_manager_call_create_session_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_create_session_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_create_session (
-    Login1Manager *proxy,
+logind_login1_manager_call_create_session (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     guint arg_unnamed_arg1,
     const gchar *arg_unnamed_arg2,
@@ -5808,8 +5808,8 @@ login1_manager_call_create_session (
 }
 
 /**
- * login1_manager_call_create_session_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_create_session_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg14: (out): Return location for return parameter or %NULL to ignore.
  * @out_unnamed_arg15: (out): Return location for return parameter or %NULL to ignore.
  * @out_unnamed_arg16: (out): Return location for return parameter or %NULL to ignore.
@@ -5818,16 +5818,16 @@ login1_manager_call_create_session (
  * @out_unnamed_arg19: (out): Return location for return parameter or %NULL to ignore.
  * @out_unnamed_arg20: (out): Return location for return parameter or %NULL to ignore.
  * @out_unnamed_arg21: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_create_session().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_create_session().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_create_session().
+ * Finishes an operation started with logind_login1_manager_call_create_session().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_create_session_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_create_session_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg14,
     gchar **out_unnamed_arg15,
     gchar **out_unnamed_arg16,
@@ -5859,8 +5859,8 @@ _out:
 }
 
 /**
- * login1_manager_call_create_session_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_create_session_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -5888,13 +5888,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CreateSession">CreateSession()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_create_session() for the asynchronous version of this method.
+ * See logind_login1_manager_call_create_session() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_create_session_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_create_session_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     guint arg_unnamed_arg1,
     const gchar *arg_unnamed_arg2,
@@ -5960,8 +5960,8 @@ _out:
 }
 
 /**
- * login1_manager_call_release_session:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_release_session:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -5969,13 +5969,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ReleaseSession">ReleaseSession()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_release_session_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_release_session_finish() to get the result of the operation.
  *
- * See login1_manager_call_release_session_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_release_session_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_release_session (
-    Login1Manager *proxy,
+logind_login1_manager_call_release_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -5993,18 +5993,18 @@ login1_manager_call_release_session (
 }
 
 /**
- * login1_manager_call_release_session_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_release_session().
+ * logind_login1_manager_call_release_session_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_release_session().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_release_session().
+ * Finishes an operation started with logind_login1_manager_call_release_session().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_release_session_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_release_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6020,21 +6020,21 @@ _out:
 }
 
 /**
- * login1_manager_call_release_session_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_release_session_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ReleaseSession">ReleaseSession()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_release_session() for the asynchronous version of this method.
+ * See logind_login1_manager_call_release_session() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_release_session_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_release_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -6058,8 +6058,8 @@ _out:
 }
 
 /**
- * login1_manager_call_activate_session:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_activate_session:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -6067,13 +6067,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ActivateSession">ActivateSession()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_activate_session_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_activate_session_finish() to get the result of the operation.
  *
- * See login1_manager_call_activate_session_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_activate_session_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_activate_session (
-    Login1Manager *proxy,
+logind_login1_manager_call_activate_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -6091,18 +6091,18 @@ login1_manager_call_activate_session (
 }
 
 /**
- * login1_manager_call_activate_session_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_activate_session().
+ * logind_login1_manager_call_activate_session_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_activate_session().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_activate_session().
+ * Finishes an operation started with logind_login1_manager_call_activate_session().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_activate_session_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_activate_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6118,21 +6118,21 @@ _out:
 }
 
 /**
- * login1_manager_call_activate_session_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_activate_session_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ActivateSession">ActivateSession()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_activate_session() for the asynchronous version of this method.
+ * See logind_login1_manager_call_activate_session() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_activate_session_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_activate_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -6156,8 +6156,8 @@ _out:
 }
 
 /**
- * login1_manager_call_activate_session_on_seat:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_activate_session_on_seat:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
@@ -6166,13 +6166,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ActivateSessionOnSeat">ActivateSessionOnSeat()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_activate_session_on_seat_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_activate_session_on_seat_finish() to get the result of the operation.
  *
- * See login1_manager_call_activate_session_on_seat_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_activate_session_on_seat_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_activate_session_on_seat (
-    Login1Manager *proxy,
+logind_login1_manager_call_activate_session_on_seat (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     GCancellable *cancellable,
@@ -6192,18 +6192,18 @@ login1_manager_call_activate_session_on_seat (
 }
 
 /**
- * login1_manager_call_activate_session_on_seat_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_activate_session_on_seat().
+ * logind_login1_manager_call_activate_session_on_seat_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_activate_session_on_seat().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_activate_session_on_seat().
+ * Finishes an operation started with logind_login1_manager_call_activate_session_on_seat().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_activate_session_on_seat_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_activate_session_on_seat_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6219,8 +6219,8 @@ _out:
 }
 
 /**
- * login1_manager_call_activate_session_on_seat_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_activate_session_on_seat_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
@@ -6228,13 +6228,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ActivateSessionOnSeat">ActivateSessionOnSeat()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_activate_session_on_seat() for the asynchronous version of this method.
+ * See logind_login1_manager_call_activate_session_on_seat() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_activate_session_on_seat_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_activate_session_on_seat_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     GCancellable *cancellable,
@@ -6260,8 +6260,8 @@ _out:
 }
 
 /**
- * login1_manager_call_lock_session:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_lock_session:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -6269,13 +6269,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.LockSession">LockSession()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_lock_session_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_lock_session_finish() to get the result of the operation.
  *
- * See login1_manager_call_lock_session_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_lock_session_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_lock_session (
-    Login1Manager *proxy,
+logind_login1_manager_call_lock_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -6293,18 +6293,18 @@ login1_manager_call_lock_session (
 }
 
 /**
- * login1_manager_call_lock_session_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_lock_session().
+ * logind_login1_manager_call_lock_session_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_lock_session().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_lock_session().
+ * Finishes an operation started with logind_login1_manager_call_lock_session().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_lock_session_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_lock_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6320,21 +6320,21 @@ _out:
 }
 
 /**
- * login1_manager_call_lock_session_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_lock_session_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.LockSession">LockSession()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_lock_session() for the asynchronous version of this method.
+ * See logind_login1_manager_call_lock_session() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_lock_session_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_lock_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -6358,8 +6358,8 @@ _out:
 }
 
 /**
- * login1_manager_call_unlock_session:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_unlock_session:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -6367,13 +6367,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.UnlockSession">UnlockSession()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_unlock_session_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_unlock_session_finish() to get the result of the operation.
  *
- * See login1_manager_call_unlock_session_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_unlock_session_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_unlock_session (
-    Login1Manager *proxy,
+logind_login1_manager_call_unlock_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -6391,18 +6391,18 @@ login1_manager_call_unlock_session (
 }
 
 /**
- * login1_manager_call_unlock_session_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_unlock_session().
+ * logind_login1_manager_call_unlock_session_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_unlock_session().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_unlock_session().
+ * Finishes an operation started with logind_login1_manager_call_unlock_session().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_unlock_session_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_unlock_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6418,21 +6418,21 @@ _out:
 }
 
 /**
- * login1_manager_call_unlock_session_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_unlock_session_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.UnlockSession">UnlockSession()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_unlock_session() for the asynchronous version of this method.
+ * See logind_login1_manager_call_unlock_session() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_unlock_session_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_unlock_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -6456,21 +6456,21 @@ _out:
 }
 
 /**
- * login1_manager_call_lock_sessions:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_lock_sessions:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.LockSessions">LockSessions()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_lock_sessions_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_lock_sessions_finish() to get the result of the operation.
  *
- * See login1_manager_call_lock_sessions_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_lock_sessions_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_lock_sessions (
-    Login1Manager *proxy,
+logind_login1_manager_call_lock_sessions (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -6486,18 +6486,18 @@ login1_manager_call_lock_sessions (
 }
 
 /**
- * login1_manager_call_lock_sessions_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_lock_sessions().
+ * logind_login1_manager_call_lock_sessions_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_lock_sessions().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_lock_sessions().
+ * Finishes an operation started with logind_login1_manager_call_lock_sessions().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_lock_sessions_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_lock_sessions_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6513,20 +6513,20 @@ _out:
 }
 
 /**
- * login1_manager_call_lock_sessions_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_lock_sessions_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.LockSessions">LockSessions()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_lock_sessions() for the asynchronous version of this method.
+ * See logind_login1_manager_call_lock_sessions() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_lock_sessions_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_lock_sessions_sync (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GError **error)
 {
@@ -6548,21 +6548,21 @@ _out:
 }
 
 /**
- * login1_manager_call_unlock_sessions:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_unlock_sessions:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.UnlockSessions">UnlockSessions()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_unlock_sessions_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_unlock_sessions_finish() to get the result of the operation.
  *
- * See login1_manager_call_unlock_sessions_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_unlock_sessions_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_unlock_sessions (
-    Login1Manager *proxy,
+logind_login1_manager_call_unlock_sessions (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -6578,18 +6578,18 @@ login1_manager_call_unlock_sessions (
 }
 
 /**
- * login1_manager_call_unlock_sessions_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_unlock_sessions().
+ * logind_login1_manager_call_unlock_sessions_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_unlock_sessions().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_unlock_sessions().
+ * Finishes an operation started with logind_login1_manager_call_unlock_sessions().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_unlock_sessions_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_unlock_sessions_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6605,20 +6605,20 @@ _out:
 }
 
 /**
- * login1_manager_call_unlock_sessions_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_unlock_sessions_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.UnlockSessions">UnlockSessions()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_unlock_sessions() for the asynchronous version of this method.
+ * See logind_login1_manager_call_unlock_sessions() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_unlock_sessions_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_unlock_sessions_sync (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GError **error)
 {
@@ -6640,8 +6640,8 @@ _out:
 }
 
 /**
- * login1_manager_call_kill_session:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_kill_session:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -6651,13 +6651,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.KillSession">KillSession()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_kill_session_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_kill_session_finish() to get the result of the operation.
  *
- * See login1_manager_call_kill_session_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_kill_session_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_kill_session (
-    Login1Manager *proxy,
+logind_login1_manager_call_kill_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gint arg_unnamed_arg2,
@@ -6679,18 +6679,18 @@ login1_manager_call_kill_session (
 }
 
 /**
- * login1_manager_call_kill_session_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_kill_session().
+ * logind_login1_manager_call_kill_session_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_kill_session().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_kill_session().
+ * Finishes an operation started with logind_login1_manager_call_kill_session().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_kill_session_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_kill_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6706,8 +6706,8 @@ _out:
 }
 
 /**
- * login1_manager_call_kill_session_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_kill_session_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -6716,13 +6716,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.KillSession">KillSession()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_kill_session() for the asynchronous version of this method.
+ * See logind_login1_manager_call_kill_session() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_kill_session_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_kill_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gint arg_unnamed_arg2,
@@ -6750,8 +6750,8 @@ _out:
 }
 
 /**
- * login1_manager_call_kill_user:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_kill_user:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
@@ -6760,13 +6760,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.KillUser">KillUser()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_kill_user_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_kill_user_finish() to get the result of the operation.
  *
- * See login1_manager_call_kill_user_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_kill_user_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_kill_user (
-    Login1Manager *proxy,
+logind_login1_manager_call_kill_user (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gint arg_unnamed_arg1,
     GCancellable *cancellable,
@@ -6786,18 +6786,18 @@ login1_manager_call_kill_user (
 }
 
 /**
- * login1_manager_call_kill_user_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_kill_user().
+ * logind_login1_manager_call_kill_user_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_kill_user().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_kill_user().
+ * Finishes an operation started with logind_login1_manager_call_kill_user().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_kill_user_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_kill_user_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6813,8 +6813,8 @@ _out:
 }
 
 /**
- * login1_manager_call_kill_user_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_kill_user_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
@@ -6822,13 +6822,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.KillUser">KillUser()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_kill_user() for the asynchronous version of this method.
+ * See logind_login1_manager_call_kill_user() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_kill_user_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_kill_user_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gint arg_unnamed_arg1,
     GCancellable *cancellable,
@@ -6854,8 +6854,8 @@ _out:
 }
 
 /**
- * login1_manager_call_terminate_session:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_terminate_session:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -6863,13 +6863,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateSession">TerminateSession()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_terminate_session_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_terminate_session_finish() to get the result of the operation.
  *
- * See login1_manager_call_terminate_session_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_terminate_session_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_terminate_session (
-    Login1Manager *proxy,
+logind_login1_manager_call_terminate_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -6887,18 +6887,18 @@ login1_manager_call_terminate_session (
 }
 
 /**
- * login1_manager_call_terminate_session_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_terminate_session().
+ * logind_login1_manager_call_terminate_session_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_terminate_session().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_terminate_session().
+ * Finishes an operation started with logind_login1_manager_call_terminate_session().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_terminate_session_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_terminate_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -6914,21 +6914,21 @@ _out:
 }
 
 /**
- * login1_manager_call_terminate_session_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_terminate_session_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateSession">TerminateSession()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_terminate_session() for the asynchronous version of this method.
+ * See logind_login1_manager_call_terminate_session() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_terminate_session_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_terminate_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -6952,8 +6952,8 @@ _out:
 }
 
 /**
- * login1_manager_call_terminate_user:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_terminate_user:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -6961,13 +6961,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateUser">TerminateUser()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_terminate_user_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_terminate_user_finish() to get the result of the operation.
  *
- * See login1_manager_call_terminate_user_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_terminate_user_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_terminate_user (
-    Login1Manager *proxy,
+logind_login1_manager_call_terminate_user (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -6985,18 +6985,18 @@ login1_manager_call_terminate_user (
 }
 
 /**
- * login1_manager_call_terminate_user_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_terminate_user().
+ * logind_login1_manager_call_terminate_user_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_terminate_user().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_terminate_user().
+ * Finishes an operation started with logind_login1_manager_call_terminate_user().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_terminate_user_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_terminate_user_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7012,21 +7012,21 @@ _out:
 }
 
 /**
- * login1_manager_call_terminate_user_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_terminate_user_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateUser">TerminateUser()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_terminate_user() for the asynchronous version of this method.
+ * See logind_login1_manager_call_terminate_user() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_terminate_user_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_terminate_user_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -7050,8 +7050,8 @@ _out:
 }
 
 /**
- * login1_manager_call_terminate_seat:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_terminate_seat:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -7059,13 +7059,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateSeat">TerminateSeat()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_terminate_seat_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_terminate_seat_finish() to get the result of the operation.
  *
- * See login1_manager_call_terminate_seat_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_terminate_seat_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_terminate_seat (
-    Login1Manager *proxy,
+logind_login1_manager_call_terminate_seat (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -7083,18 +7083,18 @@ login1_manager_call_terminate_seat (
 }
 
 /**
- * login1_manager_call_terminate_seat_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_terminate_seat().
+ * logind_login1_manager_call_terminate_seat_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_terminate_seat().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_terminate_seat().
+ * Finishes an operation started with logind_login1_manager_call_terminate_seat().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_terminate_seat_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_terminate_seat_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7110,21 +7110,21 @@ _out:
 }
 
 /**
- * login1_manager_call_terminate_seat_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_terminate_seat_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateSeat">TerminateSeat()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_terminate_seat() for the asynchronous version of this method.
+ * See logind_login1_manager_call_terminate_seat() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_terminate_seat_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_terminate_seat_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -7148,8 +7148,8 @@ _out:
 }
 
 /**
- * login1_manager_call_set_user_linger:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_set_user_linger:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -7159,13 +7159,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.SetUserLinger">SetUserLinger()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_set_user_linger_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_set_user_linger_finish() to get the result of the operation.
  *
- * See login1_manager_call_set_user_linger_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_set_user_linger_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_set_user_linger (
-    Login1Manager *proxy,
+logind_login1_manager_call_set_user_linger (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gboolean arg_unnamed_arg1,
     gboolean arg_unnamed_arg2,
@@ -7187,18 +7187,18 @@ login1_manager_call_set_user_linger (
 }
 
 /**
- * login1_manager_call_set_user_linger_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_set_user_linger().
+ * logind_login1_manager_call_set_user_linger_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_set_user_linger().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_set_user_linger().
+ * Finishes an operation started with logind_login1_manager_call_set_user_linger().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_set_user_linger_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_set_user_linger_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7214,8 +7214,8 @@ _out:
 }
 
 /**
- * login1_manager_call_set_user_linger_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_set_user_linger_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -7224,13 +7224,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.SetUserLinger">SetUserLinger()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_set_user_linger() for the asynchronous version of this method.
+ * See logind_login1_manager_call_set_user_linger() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_set_user_linger_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_set_user_linger_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gboolean arg_unnamed_arg1,
     gboolean arg_unnamed_arg2,
@@ -7258,8 +7258,8 @@ _out:
 }
 
 /**
- * login1_manager_call_attach_device:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_attach_device:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -7269,13 +7269,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.AttachDevice">AttachDevice()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_attach_device_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_attach_device_finish() to get the result of the operation.
  *
- * See login1_manager_call_attach_device_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_attach_device_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_attach_device (
-    Login1Manager *proxy,
+logind_login1_manager_call_attach_device (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gboolean arg_unnamed_arg2,
@@ -7297,18 +7297,18 @@ login1_manager_call_attach_device (
 }
 
 /**
- * login1_manager_call_attach_device_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_attach_device().
+ * logind_login1_manager_call_attach_device_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_attach_device().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_attach_device().
+ * Finishes an operation started with logind_login1_manager_call_attach_device().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_attach_device_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_attach_device_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7324,8 +7324,8 @@ _out:
 }
 
 /**
- * login1_manager_call_attach_device_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_attach_device_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -7334,13 +7334,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.AttachDevice">AttachDevice()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_attach_device() for the asynchronous version of this method.
+ * See logind_login1_manager_call_attach_device() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_attach_device_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_attach_device_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gboolean arg_unnamed_arg2,
@@ -7368,8 +7368,8 @@ _out:
 }
 
 /**
- * login1_manager_call_flush_devices:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_flush_devices:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -7377,13 +7377,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.FlushDevices">FlushDevices()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_flush_devices_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_flush_devices_finish() to get the result of the operation.
  *
- * See login1_manager_call_flush_devices_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_flush_devices_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_flush_devices (
-    Login1Manager *proxy,
+logind_login1_manager_call_flush_devices (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -7401,18 +7401,18 @@ login1_manager_call_flush_devices (
 }
 
 /**
- * login1_manager_call_flush_devices_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_flush_devices().
+ * logind_login1_manager_call_flush_devices_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_flush_devices().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_flush_devices().
+ * Finishes an operation started with logind_login1_manager_call_flush_devices().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_flush_devices_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_flush_devices_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7428,21 +7428,21 @@ _out:
 }
 
 /**
- * login1_manager_call_flush_devices_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_flush_devices_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.FlushDevices">FlushDevices()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_flush_devices() for the asynchronous version of this method.
+ * See logind_login1_manager_call_flush_devices() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_flush_devices_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_flush_devices_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -7466,8 +7466,8 @@ _out:
 }
 
 /**
- * login1_manager_call_power_off:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_power_off:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -7475,13 +7475,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.PowerOff">PowerOff()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_power_off_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_power_off_finish() to get the result of the operation.
  *
- * See login1_manager_call_power_off_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_power_off_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_power_off (
-    Login1Manager *proxy,
+logind_login1_manager_call_power_off (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -7499,18 +7499,18 @@ login1_manager_call_power_off (
 }
 
 /**
- * login1_manager_call_power_off_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_power_off().
+ * logind_login1_manager_call_power_off_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_power_off().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_power_off().
+ * Finishes an operation started with logind_login1_manager_call_power_off().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_power_off_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_power_off_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7526,21 +7526,21 @@ _out:
 }
 
 /**
- * login1_manager_call_power_off_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_power_off_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.PowerOff">PowerOff()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_power_off() for the asynchronous version of this method.
+ * See logind_login1_manager_call_power_off() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_power_off_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_power_off_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -7564,8 +7564,8 @@ _out:
 }
 
 /**
- * login1_manager_call_reboot:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_reboot:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -7573,13 +7573,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Reboot">Reboot()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_reboot_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_reboot_finish() to get the result of the operation.
  *
- * See login1_manager_call_reboot_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_reboot_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_reboot (
-    Login1Manager *proxy,
+logind_login1_manager_call_reboot (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -7597,18 +7597,18 @@ login1_manager_call_reboot (
 }
 
 /**
- * login1_manager_call_reboot_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_reboot().
+ * logind_login1_manager_call_reboot_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_reboot().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_reboot().
+ * Finishes an operation started with logind_login1_manager_call_reboot().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_reboot_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_reboot_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7624,21 +7624,21 @@ _out:
 }
 
 /**
- * login1_manager_call_reboot_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_reboot_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Reboot">Reboot()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_reboot() for the asynchronous version of this method.
+ * See logind_login1_manager_call_reboot() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_reboot_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_reboot_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -7662,8 +7662,8 @@ _out:
 }
 
 /**
- * login1_manager_call_suspend:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_suspend:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -7671,13 +7671,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Suspend">Suspend()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_suspend_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_suspend_finish() to get the result of the operation.
  *
- * See login1_manager_call_suspend_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_suspend_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_suspend (
-    Login1Manager *proxy,
+logind_login1_manager_call_suspend (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -7695,18 +7695,18 @@ login1_manager_call_suspend (
 }
 
 /**
- * login1_manager_call_suspend_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_suspend().
+ * logind_login1_manager_call_suspend_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_suspend().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_suspend().
+ * Finishes an operation started with logind_login1_manager_call_suspend().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_suspend_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_suspend_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7722,21 +7722,21 @@ _out:
 }
 
 /**
- * login1_manager_call_suspend_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_suspend_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Suspend">Suspend()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_suspend() for the asynchronous version of this method.
+ * See logind_login1_manager_call_suspend() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_suspend_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_suspend_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -7760,8 +7760,8 @@ _out:
 }
 
 /**
- * login1_manager_call_hibernate:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_hibernate:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -7769,13 +7769,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Hibernate">Hibernate()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_hibernate_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_hibernate_finish() to get the result of the operation.
  *
- * See login1_manager_call_hibernate_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_hibernate_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_hibernate (
-    Login1Manager *proxy,
+logind_login1_manager_call_hibernate (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -7793,18 +7793,18 @@ login1_manager_call_hibernate (
 }
 
 /**
- * login1_manager_call_hibernate_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_hibernate().
+ * logind_login1_manager_call_hibernate_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_hibernate().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_hibernate().
+ * Finishes an operation started with logind_login1_manager_call_hibernate().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_hibernate_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_hibernate_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7820,21 +7820,21 @@ _out:
 }
 
 /**
- * login1_manager_call_hibernate_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_hibernate_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Hibernate">Hibernate()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_hibernate() for the asynchronous version of this method.
+ * See logind_login1_manager_call_hibernate() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_hibernate_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_hibernate_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -7858,8 +7858,8 @@ _out:
 }
 
 /**
- * login1_manager_call_hybrid_sleep:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_hybrid_sleep:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
@@ -7867,13 +7867,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.HybridSleep">HybridSleep()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_hybrid_sleep_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_hybrid_sleep_finish() to get the result of the operation.
  *
- * See login1_manager_call_hybrid_sleep_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_hybrid_sleep_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_hybrid_sleep (
-    Login1Manager *proxy,
+logind_login1_manager_call_hybrid_sleep (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
@@ -7891,18 +7891,18 @@ login1_manager_call_hybrid_sleep (
 }
 
 /**
- * login1_manager_call_hybrid_sleep_finish:
- * @proxy: A #Login1ManagerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_hybrid_sleep().
+ * logind_login1_manager_call_hybrid_sleep_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_hybrid_sleep().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_hybrid_sleep().
+ * Finishes an operation started with logind_login1_manager_call_hybrid_sleep().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_hybrid_sleep_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_hybrid_sleep_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -7918,21 +7918,21 @@ _out:
 }
 
 /**
- * login1_manager_call_hybrid_sleep_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_hybrid_sleep_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.HybridSleep">HybridSleep()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_hybrid_sleep() for the asynchronous version of this method.
+ * See logind_login1_manager_call_hybrid_sleep() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_hybrid_sleep_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_hybrid_sleep_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -7956,21 +7956,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_power_off:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_power_off:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanPowerOff">CanPowerOff()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_can_power_off_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_can_power_off_finish() to get the result of the operation.
  *
- * See login1_manager_call_can_power_off_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_can_power_off_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_can_power_off (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_power_off (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -7986,19 +7986,19 @@ login1_manager_call_can_power_off (
 }
 
 /**
- * login1_manager_call_can_power_off_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_power_off_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_can_power_off().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_can_power_off().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_can_power_off().
+ * Finishes an operation started with logind_login1_manager_call_can_power_off().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_power_off_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_power_off_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error)
@@ -8016,21 +8016,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_power_off_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_power_off_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanPowerOff">CanPowerOff()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_can_power_off() for the asynchronous version of this method.
+ * See logind_login1_manager_call_can_power_off() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_power_off_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_power_off_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -8054,21 +8054,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_reboot:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_reboot:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanReboot">CanReboot()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_can_reboot_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_can_reboot_finish() to get the result of the operation.
  *
- * See login1_manager_call_can_reboot_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_can_reboot_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_can_reboot (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_reboot (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -8084,19 +8084,19 @@ login1_manager_call_can_reboot (
 }
 
 /**
- * login1_manager_call_can_reboot_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_reboot_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_can_reboot().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_can_reboot().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_can_reboot().
+ * Finishes an operation started with logind_login1_manager_call_can_reboot().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_reboot_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_reboot_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error)
@@ -8114,21 +8114,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_reboot_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_reboot_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanReboot">CanReboot()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_can_reboot() for the asynchronous version of this method.
+ * See logind_login1_manager_call_can_reboot() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_reboot_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_reboot_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -8152,21 +8152,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_suspend:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_suspend:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanSuspend">CanSuspend()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_can_suspend_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_can_suspend_finish() to get the result of the operation.
  *
- * See login1_manager_call_can_suspend_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_can_suspend_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_can_suspend (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_suspend (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -8182,19 +8182,19 @@ login1_manager_call_can_suspend (
 }
 
 /**
- * login1_manager_call_can_suspend_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_suspend_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_can_suspend().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_can_suspend().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_can_suspend().
+ * Finishes an operation started with logind_login1_manager_call_can_suspend().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_suspend_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_suspend_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error)
@@ -8212,21 +8212,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_suspend_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_suspend_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanSuspend">CanSuspend()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_can_suspend() for the asynchronous version of this method.
+ * See logind_login1_manager_call_can_suspend() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_suspend_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_suspend_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -8250,21 +8250,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_hibernate:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_hibernate:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanHibernate">CanHibernate()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_can_hibernate_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_can_hibernate_finish() to get the result of the operation.
  *
- * See login1_manager_call_can_hibernate_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_can_hibernate_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_can_hibernate (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_hibernate (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -8280,19 +8280,19 @@ login1_manager_call_can_hibernate (
 }
 
 /**
- * login1_manager_call_can_hibernate_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_hibernate_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_can_hibernate().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_can_hibernate().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_can_hibernate().
+ * Finishes an operation started with logind_login1_manager_call_can_hibernate().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_hibernate_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_hibernate_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error)
@@ -8310,21 +8310,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_hibernate_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_hibernate_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanHibernate">CanHibernate()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_can_hibernate() for the asynchronous version of this method.
+ * See logind_login1_manager_call_can_hibernate() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_hibernate_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_hibernate_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -8348,21 +8348,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_hybrid_sleep:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_hybrid_sleep:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanHybridSleep">CanHybridSleep()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_can_hybrid_sleep_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_can_hybrid_sleep_finish() to get the result of the operation.
  *
- * See login1_manager_call_can_hybrid_sleep_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_can_hybrid_sleep_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_can_hybrid_sleep (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_hybrid_sleep (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -8378,19 +8378,19 @@ login1_manager_call_can_hybrid_sleep (
 }
 
 /**
- * login1_manager_call_can_hybrid_sleep_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_hybrid_sleep_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_can_hybrid_sleep().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_can_hybrid_sleep().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_can_hybrid_sleep().
+ * Finishes an operation started with logind_login1_manager_call_can_hybrid_sleep().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_hybrid_sleep_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_hybrid_sleep_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error)
@@ -8408,21 +8408,21 @@ _out:
 }
 
 /**
- * login1_manager_call_can_hybrid_sleep_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_can_hybrid_sleep_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.CanHybridSleep">CanHybridSleep()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_can_hybrid_sleep() for the asynchronous version of this method.
+ * See logind_login1_manager_call_can_hybrid_sleep() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_can_hybrid_sleep_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_can_hybrid_sleep_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error)
@@ -8446,8 +8446,8 @@ _out:
 }
 
 /**
- * login1_manager_call_inhibit:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_inhibit:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -8458,13 +8458,13 @@ _out:
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Inhibit">Inhibit()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_call_inhibit_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_call_inhibit_finish() to get the result of the operation.
  *
- * See login1_manager_call_inhibit_sync() for the synchronous, blocking version of this method.
+ * See logind_login1_manager_call_inhibit_sync() for the synchronous, blocking version of this method.
  */
 void
-login1_manager_call_inhibit (
-    Login1Manager *proxy,
+logind_login1_manager_call_inhibit (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     const gchar *arg_unnamed_arg2,
@@ -8488,19 +8488,19 @@ login1_manager_call_inhibit (
 }
 
 /**
- * login1_manager_call_inhibit_finish:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_inhibit_finish:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @out_unnamed_arg4: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_call_inhibit().
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_call_inhibit().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with login1_manager_call_inhibit().
+ * Finishes an operation started with logind_login1_manager_call_inhibit().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_inhibit_finish (
-    Login1Manager *proxy,
+logind_login1_manager_call_inhibit_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg4,
     GAsyncResult *res,
     GError **error)
@@ -8518,8 +8518,8 @@ _out:
 }
 
 /**
- * login1_manager_call_inhibit_sync:
- * @proxy: A #Login1ManagerProxy.
+ * logind_login1_manager_call_inhibit_sync:
+ * @proxy: A #logindLogin1ManagerProxy.
  * @arg_unnamed_arg0: Argument to pass with the method invocation.
  * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @arg_unnamed_arg2: Argument to pass with the method invocation.
@@ -8530,13 +8530,13 @@ _out:
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Inhibit">Inhibit()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See login1_manager_call_inhibit() for the asynchronous version of this method.
+ * See logind_login1_manager_call_inhibit() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-login1_manager_call_inhibit_sync (
-    Login1Manager *proxy,
+logind_login1_manager_call_inhibit_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     const gchar *arg_unnamed_arg2,
@@ -8568,8 +8568,8 @@ _out:
 }
 
 /**
- * login1_manager_complete_get_session:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_get_session:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg1: Parameter to return.
  *
@@ -8578,8 +8578,8 @@ _out:
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_get_session (
-    Login1Manager *object,
+logind_login1_manager_complete_get_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1)
 {
@@ -8589,8 +8589,8 @@ login1_manager_complete_get_session (
 }
 
 /**
- * login1_manager_complete_get_session_by_pid:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_get_session_by_pid:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg1: Parameter to return.
  *
@@ -8599,8 +8599,8 @@ login1_manager_complete_get_session (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_get_session_by_pid (
-    Login1Manager *object,
+logind_login1_manager_complete_get_session_by_pid (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1)
 {
@@ -8610,8 +8610,8 @@ login1_manager_complete_get_session_by_pid (
 }
 
 /**
- * login1_manager_complete_get_user:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_get_user:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg1: Parameter to return.
  *
@@ -8620,8 +8620,8 @@ login1_manager_complete_get_session_by_pid (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_get_user (
-    Login1Manager *object,
+logind_login1_manager_complete_get_user (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1)
 {
@@ -8631,8 +8631,8 @@ login1_manager_complete_get_user (
 }
 
 /**
- * login1_manager_complete_get_user_by_pid:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_get_user_by_pid:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg1: Parameter to return.
  *
@@ -8641,8 +8641,8 @@ login1_manager_complete_get_user (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_get_user_by_pid (
-    Login1Manager *object,
+logind_login1_manager_complete_get_user_by_pid (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1)
 {
@@ -8652,8 +8652,8 @@ login1_manager_complete_get_user_by_pid (
 }
 
 /**
- * login1_manager_complete_get_seat:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_get_seat:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg1: Parameter to return.
  *
@@ -8662,8 +8662,8 @@ login1_manager_complete_get_user_by_pid (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_get_seat (
-    Login1Manager *object,
+logind_login1_manager_complete_get_seat (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1)
 {
@@ -8673,8 +8673,8 @@ login1_manager_complete_get_seat (
 }
 
 /**
- * login1_manager_complete_list_sessions:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_list_sessions:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg0: Parameter to return.
  *
@@ -8683,8 +8683,8 @@ login1_manager_complete_get_seat (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_list_sessions (
-    Login1Manager *object,
+logind_login1_manager_complete_list_sessions (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg0)
 {
@@ -8694,8 +8694,8 @@ login1_manager_complete_list_sessions (
 }
 
 /**
- * login1_manager_complete_list_users:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_list_users:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg0: Parameter to return.
  *
@@ -8704,8 +8704,8 @@ login1_manager_complete_list_sessions (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_list_users (
-    Login1Manager *object,
+logind_login1_manager_complete_list_users (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg0)
 {
@@ -8715,8 +8715,8 @@ login1_manager_complete_list_users (
 }
 
 /**
- * login1_manager_complete_list_seats:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_list_seats:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg0: Parameter to return.
  *
@@ -8725,8 +8725,8 @@ login1_manager_complete_list_users (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_list_seats (
-    Login1Manager *object,
+logind_login1_manager_complete_list_seats (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg0)
 {
@@ -8736,8 +8736,8 @@ login1_manager_complete_list_seats (
 }
 
 /**
- * login1_manager_complete_list_inhibitors:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_list_inhibitors:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg0: Parameter to return.
  *
@@ -8746,8 +8746,8 @@ login1_manager_complete_list_seats (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_list_inhibitors (
-    Login1Manager *object,
+logind_login1_manager_complete_list_inhibitors (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg0)
 {
@@ -8757,8 +8757,8 @@ login1_manager_complete_list_inhibitors (
 }
 
 /**
- * login1_manager_complete_create_session:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_create_session:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg14: Parameter to return.
  * @unnamed_arg15: Parameter to return.
@@ -8774,8 +8774,8 @@ login1_manager_complete_list_inhibitors (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_create_session (
-    Login1Manager *object,
+logind_login1_manager_complete_create_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg14,
     const gchar *unnamed_arg15,
@@ -8799,8 +8799,8 @@ login1_manager_complete_create_session (
 }
 
 /**
- * login1_manager_complete_release_session:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_release_session:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ReleaseSession">ReleaseSession()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8808,8 +8808,8 @@ login1_manager_complete_create_session (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_release_session (
-    Login1Manager *object,
+logind_login1_manager_complete_release_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8817,8 +8817,8 @@ login1_manager_complete_release_session (
 }
 
 /**
- * login1_manager_complete_activate_session:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_activate_session:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ActivateSession">ActivateSession()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8826,8 +8826,8 @@ login1_manager_complete_release_session (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_activate_session (
-    Login1Manager *object,
+logind_login1_manager_complete_activate_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8835,8 +8835,8 @@ login1_manager_complete_activate_session (
 }
 
 /**
- * login1_manager_complete_activate_session_on_seat:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_activate_session_on_seat:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.ActivateSessionOnSeat">ActivateSessionOnSeat()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8844,8 +8844,8 @@ login1_manager_complete_activate_session (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_activate_session_on_seat (
-    Login1Manager *object,
+logind_login1_manager_complete_activate_session_on_seat (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8853,8 +8853,8 @@ login1_manager_complete_activate_session_on_seat (
 }
 
 /**
- * login1_manager_complete_lock_session:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_lock_session:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.LockSession">LockSession()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8862,8 +8862,8 @@ login1_manager_complete_activate_session_on_seat (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_lock_session (
-    Login1Manager *object,
+logind_login1_manager_complete_lock_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8871,8 +8871,8 @@ login1_manager_complete_lock_session (
 }
 
 /**
- * login1_manager_complete_unlock_session:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_unlock_session:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.UnlockSession">UnlockSession()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8880,8 +8880,8 @@ login1_manager_complete_lock_session (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_unlock_session (
-    Login1Manager *object,
+logind_login1_manager_complete_unlock_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8889,8 +8889,8 @@ login1_manager_complete_unlock_session (
 }
 
 /**
- * login1_manager_complete_lock_sessions:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_lock_sessions:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.LockSessions">LockSessions()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8898,8 +8898,8 @@ login1_manager_complete_unlock_session (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_lock_sessions (
-    Login1Manager *object,
+logind_login1_manager_complete_lock_sessions (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8907,8 +8907,8 @@ login1_manager_complete_lock_sessions (
 }
 
 /**
- * login1_manager_complete_unlock_sessions:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_unlock_sessions:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.UnlockSessions">UnlockSessions()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8916,8 +8916,8 @@ login1_manager_complete_lock_sessions (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_unlock_sessions (
-    Login1Manager *object,
+logind_login1_manager_complete_unlock_sessions (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8925,8 +8925,8 @@ login1_manager_complete_unlock_sessions (
 }
 
 /**
- * login1_manager_complete_kill_session:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_kill_session:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.KillSession">KillSession()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8934,8 +8934,8 @@ login1_manager_complete_unlock_sessions (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_kill_session (
-    Login1Manager *object,
+logind_login1_manager_complete_kill_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8943,8 +8943,8 @@ login1_manager_complete_kill_session (
 }
 
 /**
- * login1_manager_complete_kill_user:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_kill_user:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.KillUser">KillUser()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8952,8 +8952,8 @@ login1_manager_complete_kill_session (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_kill_user (
-    Login1Manager *object,
+logind_login1_manager_complete_kill_user (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8961,8 +8961,8 @@ login1_manager_complete_kill_user (
 }
 
 /**
- * login1_manager_complete_terminate_session:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_terminate_session:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateSession">TerminateSession()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8970,8 +8970,8 @@ login1_manager_complete_kill_user (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_terminate_session (
-    Login1Manager *object,
+logind_login1_manager_complete_terminate_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8979,8 +8979,8 @@ login1_manager_complete_terminate_session (
 }
 
 /**
- * login1_manager_complete_terminate_user:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_terminate_user:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateUser">TerminateUser()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -8988,8 +8988,8 @@ login1_manager_complete_terminate_session (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_terminate_user (
-    Login1Manager *object,
+logind_login1_manager_complete_terminate_user (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -8997,8 +8997,8 @@ login1_manager_complete_terminate_user (
 }
 
 /**
- * login1_manager_complete_terminate_seat:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_terminate_seat:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.TerminateSeat">TerminateSeat()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -9006,8 +9006,8 @@ login1_manager_complete_terminate_user (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_terminate_seat (
-    Login1Manager *object,
+logind_login1_manager_complete_terminate_seat (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -9015,8 +9015,8 @@ login1_manager_complete_terminate_seat (
 }
 
 /**
- * login1_manager_complete_set_user_linger:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_set_user_linger:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.SetUserLinger">SetUserLinger()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -9024,8 +9024,8 @@ login1_manager_complete_terminate_seat (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_set_user_linger (
-    Login1Manager *object,
+logind_login1_manager_complete_set_user_linger (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -9033,8 +9033,8 @@ login1_manager_complete_set_user_linger (
 }
 
 /**
- * login1_manager_complete_attach_device:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_attach_device:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.AttachDevice">AttachDevice()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -9042,8 +9042,8 @@ login1_manager_complete_set_user_linger (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_attach_device (
-    Login1Manager *object,
+logind_login1_manager_complete_attach_device (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -9051,8 +9051,8 @@ login1_manager_complete_attach_device (
 }
 
 /**
- * login1_manager_complete_flush_devices:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_flush_devices:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.FlushDevices">FlushDevices()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -9060,8 +9060,8 @@ login1_manager_complete_attach_device (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_flush_devices (
-    Login1Manager *object,
+logind_login1_manager_complete_flush_devices (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -9069,8 +9069,8 @@ login1_manager_complete_flush_devices (
 }
 
 /**
- * login1_manager_complete_power_off:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_power_off:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.PowerOff">PowerOff()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -9078,8 +9078,8 @@ login1_manager_complete_flush_devices (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_power_off (
-    Login1Manager *object,
+logind_login1_manager_complete_power_off (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -9087,8 +9087,8 @@ login1_manager_complete_power_off (
 }
 
 /**
- * login1_manager_complete_reboot:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_reboot:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Reboot">Reboot()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -9096,8 +9096,8 @@ login1_manager_complete_power_off (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_reboot (
-    Login1Manager *object,
+logind_login1_manager_complete_reboot (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -9105,8 +9105,8 @@ login1_manager_complete_reboot (
 }
 
 /**
- * login1_manager_complete_suspend:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_suspend:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Suspend">Suspend()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -9114,8 +9114,8 @@ login1_manager_complete_reboot (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_suspend (
-    Login1Manager *object,
+logind_login1_manager_complete_suspend (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -9123,8 +9123,8 @@ login1_manager_complete_suspend (
 }
 
 /**
- * login1_manager_complete_hibernate:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_hibernate:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.Hibernate">Hibernate()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -9132,8 +9132,8 @@ login1_manager_complete_suspend (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_hibernate (
-    Login1Manager *object,
+logind_login1_manager_complete_hibernate (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -9141,8 +9141,8 @@ login1_manager_complete_hibernate (
 }
 
 /**
- * login1_manager_complete_hybrid_sleep:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_hybrid_sleep:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-login1-Manager.HybridSleep">HybridSleep()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -9150,8 +9150,8 @@ login1_manager_complete_hibernate (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_hybrid_sleep (
-    Login1Manager *object,
+logind_login1_manager_complete_hybrid_sleep (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -9159,8 +9159,8 @@ login1_manager_complete_hybrid_sleep (
 }
 
 /**
- * login1_manager_complete_can_power_off:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_can_power_off:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg0: Parameter to return.
  *
@@ -9169,8 +9169,8 @@ login1_manager_complete_hybrid_sleep (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_can_power_off (
-    Login1Manager *object,
+logind_login1_manager_complete_can_power_off (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0)
 {
@@ -9180,8 +9180,8 @@ login1_manager_complete_can_power_off (
 }
 
 /**
- * login1_manager_complete_can_reboot:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_can_reboot:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg0: Parameter to return.
  *
@@ -9190,8 +9190,8 @@ login1_manager_complete_can_power_off (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_can_reboot (
-    Login1Manager *object,
+logind_login1_manager_complete_can_reboot (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0)
 {
@@ -9201,8 +9201,8 @@ login1_manager_complete_can_reboot (
 }
 
 /**
- * login1_manager_complete_can_suspend:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_can_suspend:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg0: Parameter to return.
  *
@@ -9211,8 +9211,8 @@ login1_manager_complete_can_reboot (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_can_suspend (
-    Login1Manager *object,
+logind_login1_manager_complete_can_suspend (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0)
 {
@@ -9222,8 +9222,8 @@ login1_manager_complete_can_suspend (
 }
 
 /**
- * login1_manager_complete_can_hibernate:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_can_hibernate:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg0: Parameter to return.
  *
@@ -9232,8 +9232,8 @@ login1_manager_complete_can_suspend (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_can_hibernate (
-    Login1Manager *object,
+logind_login1_manager_complete_can_hibernate (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0)
 {
@@ -9243,8 +9243,8 @@ login1_manager_complete_can_hibernate (
 }
 
 /**
- * login1_manager_complete_can_hybrid_sleep:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_can_hybrid_sleep:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg0: Parameter to return.
  *
@@ -9253,8 +9253,8 @@ login1_manager_complete_can_hibernate (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_can_hybrid_sleep (
-    Login1Manager *object,
+logind_login1_manager_complete_can_hybrid_sleep (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0)
 {
@@ -9264,8 +9264,8 @@ login1_manager_complete_can_hybrid_sleep (
 }
 
 /**
- * login1_manager_complete_inhibit:
- * @object: A #Login1Manager.
+ * logind_login1_manager_complete_inhibit:
+ * @object: A #logindLogin1Manager.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  * @unnamed_arg4: Parameter to return.
  *
@@ -9274,8 +9274,8 @@ login1_manager_complete_can_hybrid_sleep (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-login1_manager_complete_inhibit (
-    Login1Manager *object,
+logind_login1_manager_complete_inhibit (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg4)
 {
@@ -9287,45 +9287,45 @@ login1_manager_complete_inhibit (
 /* ------------------------------------------------------------------------ */
 
 /**
- * Login1ManagerProxy:
+ * logindLogin1ManagerProxy:
  *
- * The #Login1ManagerProxy structure contains only private data and should only be accessed using the provided API.
+ * The #logindLogin1ManagerProxy structure contains only private data and should only be accessed using the provided API.
  */
 
 /**
- * Login1ManagerProxyClass:
+ * logindLogin1ManagerProxyClass:
  * @parent_class: The parent class.
  *
- * Class structure for #Login1ManagerProxy.
+ * Class structure for #logindLogin1ManagerProxy.
  */
 
-struct _Login1ManagerProxyPrivate
+struct _logindLogin1ManagerProxyPrivate
 {
   GData *qdata;
 };
 
-static void login1_manager_proxy_iface_init (Login1ManagerIface *iface);
+static void logind_login1_manager_proxy_iface_init (logindLogin1ManagerIface *iface);
 
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (Login1ManagerProxy, login1_manager_proxy, G_TYPE_DBUS_PROXY,
-                         G_ADD_PRIVATE (Login1ManagerProxy)
-                         G_IMPLEMENT_INTERFACE (TYPE_LOGIN1_MANAGER, login1_manager_proxy_iface_init));
+G_DEFINE_TYPE_WITH_CODE (logindLogin1ManagerProxy, logind_login1_manager_proxy, G_TYPE_DBUS_PROXY,
+                         G_ADD_PRIVATE (logindLogin1ManagerProxy)
+                         G_IMPLEMENT_INTERFACE (LOGIND_TYPE_LOGIN1_MANAGER, logind_login1_manager_proxy_iface_init));
 
 #else
-G_DEFINE_TYPE_WITH_CODE (Login1ManagerProxy, login1_manager_proxy, G_TYPE_DBUS_PROXY,
-                         G_IMPLEMENT_INTERFACE (TYPE_LOGIN1_MANAGER, login1_manager_proxy_iface_init));
+G_DEFINE_TYPE_WITH_CODE (logindLogin1ManagerProxy, logind_login1_manager_proxy, G_TYPE_DBUS_PROXY,
+                         G_IMPLEMENT_INTERFACE (LOGIND_TYPE_LOGIN1_MANAGER, logind_login1_manager_proxy_iface_init));
 
 #endif
 static void
-login1_manager_proxy_finalize (GObject *object)
+logind_login1_manager_proxy_finalize (GObject *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   g_datalist_clear (&proxy->priv->qdata);
-  G_OBJECT_CLASS (login1_manager_proxy_parent_class)->finalize (object);
+  G_OBJECT_CLASS (logind_login1_manager_proxy_parent_class)->finalize (object);
 }
 
 static void
-login1_manager_proxy_get_property (GObject      *object,
+logind_login1_manager_proxy_get_property (GObject      *object,
   guint         prop_id,
   GValue       *value,
   GParamSpec   *pspec G_GNUC_UNUSED)
@@ -9333,7 +9333,7 @@ login1_manager_proxy_get_property (GObject      *object,
   const _ExtendedGDBusPropertyInfo *info;
   GVariant *variant;
   g_assert (prop_id != 0 && prop_id - 1 < 18);
-  info = _login1_manager_property_info_pointers[prop_id - 1];
+  info = _logind_login1_manager_property_info_pointers[prop_id - 1];
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);
   if (info->use_gvariant)
     {
@@ -9349,7 +9349,7 @@ login1_manager_proxy_get_property (GObject      *object,
 }
 
 static void
-login1_manager_proxy_set_property_cb (GDBusProxy *proxy,
+logind_login1_manager_proxy_set_property_cb (GDBusProxy *proxy,
   GAsyncResult *res,
   gpointer      user_data)
 {
@@ -9372,7 +9372,7 @@ login1_manager_proxy_set_property_cb (GDBusProxy *proxy,
 }
 
 static void
-login1_manager_proxy_set_property (GObject      *object,
+logind_login1_manager_proxy_set_property (GObject      *object,
   guint         prop_id,
   const GValue *value,
   GParamSpec   *pspec G_GNUC_UNUSED)
@@ -9380,19 +9380,19 @@ login1_manager_proxy_set_property (GObject      *object,
   const _ExtendedGDBusPropertyInfo *info;
   GVariant *variant;
   g_assert (prop_id != 0 && prop_id - 1 < 18);
-  info = _login1_manager_property_info_pointers[prop_id - 1];
+  info = _logind_login1_manager_property_info_pointers[prop_id - 1];
   variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));
   g_dbus_proxy_call (G_DBUS_PROXY (object),
     "org.freedesktop.DBus.Properties.Set",
     g_variant_new ("(ssv)", "org.freedesktop.login1.Manager", info->parent_struct.name, variant),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
-    NULL, (GAsyncReadyCallback) login1_manager_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
+    NULL, (GAsyncReadyCallback) logind_login1_manager_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
   g_variant_unref (variant);
 }
 
 static void
-login1_manager_proxy_g_signal (GDBusProxy *proxy,
+logind_login1_manager_proxy_g_signal (GDBusProxy *proxy,
   const gchar *sender_name G_GNUC_UNUSED,
   const gchar *signal_name,
   GVariant *parameters)
@@ -9404,12 +9404,12 @@ login1_manager_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_login1_manager_interface_info.parent_struct, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_logind_login1_manager_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
   paramv = g_new0 (GValue, num_params + 1);
-  g_value_init (&paramv[0], TYPE_LOGIN1_MANAGER);
+  g_value_init (&paramv[0], LOGIND_TYPE_LOGIN1_MANAGER);
   g_value_set_object (&paramv[0], proxy);
   g_variant_iter_init (&iter, parameters);
   n = 1;
@@ -9426,7 +9426,7 @@ login1_manager_proxy_g_signal (GDBusProxy *proxy,
         g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
       g_variant_unref (child);
     }
-  signal_id = g_signal_lookup (info->signal_name, TYPE_LOGIN1_MANAGER);
+  signal_id = g_signal_lookup (info->signal_name, LOGIND_TYPE_LOGIN1_MANAGER);
   g_signal_emitv (paramv, signal_id, 0, NULL);
   for (n = 0; n < num_params + 1; n++)
     g_value_unset (&paramv[n]);
@@ -9434,11 +9434,11 @@ login1_manager_proxy_g_signal (GDBusProxy *proxy,
 }
 
 static void
-login1_manager_proxy_g_properties_changed (GDBusProxy *_proxy,
+logind_login1_manager_proxy_g_properties_changed (GDBusProxy *_proxy,
   GVariant *changed_properties,
   const gchar *const *invalidated_properties)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (_proxy);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (_proxy);
   guint n;
   const gchar *key;
   GVariantIter *iter;
@@ -9446,7 +9446,7 @@ login1_manager_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_login1_manager_interface_info.parent_struct, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_logind_login1_manager_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -9454,7 +9454,7 @@ login1_manager_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_login1_manager_interface_info.parent_struct, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_logind_login1_manager_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -9462,9 +9462,9 @@ login1_manager_proxy_g_properties_changed (GDBusProxy *_proxy,
 }
 
 static guint 
-login1_manager_proxy_get_nauto_vts (Login1Manager *object)
+logind_login1_manager_proxy_get_nauto_vts (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   guint value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "NAutoVTs");
@@ -9477,9 +9477,9 @@ login1_manager_proxy_get_nauto_vts (Login1Manager *object)
 }
 
 static const gchar *const *
-login1_manager_proxy_get_kill_only_users (Login1Manager *object)
+logind_login1_manager_proxy_get_kill_only_users (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   const gchar *const *value = NULL;
   value = g_datalist_get_data (&proxy->priv->qdata, "KillOnlyUsers");
@@ -9496,9 +9496,9 @@ login1_manager_proxy_get_kill_only_users (Login1Manager *object)
 }
 
 static const gchar *const *
-login1_manager_proxy_get_kill_exclude_users (Login1Manager *object)
+logind_login1_manager_proxy_get_kill_exclude_users (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   const gchar *const *value = NULL;
   value = g_datalist_get_data (&proxy->priv->qdata, "KillExcludeUsers");
@@ -9515,9 +9515,9 @@ login1_manager_proxy_get_kill_exclude_users (Login1Manager *object)
 }
 
 static gboolean 
-login1_manager_proxy_get_kill_user_processes (Login1Manager *object)
+logind_login1_manager_proxy_get_kill_user_processes (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   gboolean value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "KillUserProcesses");
@@ -9530,9 +9530,9 @@ login1_manager_proxy_get_kill_user_processes (Login1Manager *object)
 }
 
 static gboolean 
-login1_manager_proxy_get_idle_hint (Login1Manager *object)
+logind_login1_manager_proxy_get_idle_hint (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   gboolean value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "IdleHint");
@@ -9545,9 +9545,9 @@ login1_manager_proxy_get_idle_hint (Login1Manager *object)
 }
 
 static guint64 
-login1_manager_proxy_get_idle_since_hint (Login1Manager *object)
+logind_login1_manager_proxy_get_idle_since_hint (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   guint64 value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "IdleSinceHint");
@@ -9560,9 +9560,9 @@ login1_manager_proxy_get_idle_since_hint (Login1Manager *object)
 }
 
 static guint64 
-login1_manager_proxy_get_idle_since_hint_monotonic (Login1Manager *object)
+logind_login1_manager_proxy_get_idle_since_hint_monotonic (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   guint64 value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "IdleSinceHintMonotonic");
@@ -9575,9 +9575,9 @@ login1_manager_proxy_get_idle_since_hint_monotonic (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_proxy_get_block_inhibited (Login1Manager *object)
+logind_login1_manager_proxy_get_block_inhibited (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "BlockInhibited");
@@ -9590,9 +9590,9 @@ login1_manager_proxy_get_block_inhibited (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_proxy_get_delay_inhibited (Login1Manager *object)
+logind_login1_manager_proxy_get_delay_inhibited (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "DelayInhibited");
@@ -9605,9 +9605,9 @@ login1_manager_proxy_get_delay_inhibited (Login1Manager *object)
 }
 
 static guint64 
-login1_manager_proxy_get_inhibit_delay_max_usec (Login1Manager *object)
+logind_login1_manager_proxy_get_inhibit_delay_max_usec (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   guint64 value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "InhibitDelayMaxUSec");
@@ -9620,9 +9620,9 @@ login1_manager_proxy_get_inhibit_delay_max_usec (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_proxy_get_handle_power_key (Login1Manager *object)
+logind_login1_manager_proxy_get_handle_power_key (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "HandlePowerKey");
@@ -9635,9 +9635,9 @@ login1_manager_proxy_get_handle_power_key (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_proxy_get_handle_suspend_key (Login1Manager *object)
+logind_login1_manager_proxy_get_handle_suspend_key (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "HandleSuspendKey");
@@ -9650,9 +9650,9 @@ login1_manager_proxy_get_handle_suspend_key (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_proxy_get_handle_hibernate_key (Login1Manager *object)
+logind_login1_manager_proxy_get_handle_hibernate_key (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "HandleHibernateKey");
@@ -9665,9 +9665,9 @@ login1_manager_proxy_get_handle_hibernate_key (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_proxy_get_handle_lid_switch (Login1Manager *object)
+logind_login1_manager_proxy_get_handle_lid_switch (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "HandleLidSwitch");
@@ -9680,9 +9680,9 @@ login1_manager_proxy_get_handle_lid_switch (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_proxy_get_idle_action (Login1Manager *object)
+logind_login1_manager_proxy_get_idle_action (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "IdleAction");
@@ -9695,9 +9695,9 @@ login1_manager_proxy_get_idle_action (Login1Manager *object)
 }
 
 static guint64 
-login1_manager_proxy_get_idle_action_usec (Login1Manager *object)
+logind_login1_manager_proxy_get_idle_action_usec (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   guint64 value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "IdleActionUSec");
@@ -9710,9 +9710,9 @@ login1_manager_proxy_get_idle_action_usec (Login1Manager *object)
 }
 
 static gboolean 
-login1_manager_proxy_get_preparing_for_shutdown (Login1Manager *object)
+logind_login1_manager_proxy_get_preparing_for_shutdown (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   gboolean value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "PreparingForShutdown");
@@ -9725,9 +9725,9 @@ login1_manager_proxy_get_preparing_for_shutdown (Login1Manager *object)
 }
 
 static gboolean 
-login1_manager_proxy_get_preparing_for_sleep (Login1Manager *object)
+logind_login1_manager_proxy_get_preparing_for_sleep (logindLogin1Manager *object)
 {
-  Login1ManagerProxy *proxy = LOGIN1_MANAGER_PROXY (object);
+  logindLogin1ManagerProxy *proxy = LOGIND_LOGIN1_MANAGER_PROXY (object);
   GVariant *variant;
   gboolean value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "PreparingForSleep");
@@ -9740,64 +9740,64 @@ login1_manager_proxy_get_preparing_for_sleep (Login1Manager *object)
 }
 
 static void
-login1_manager_proxy_init (Login1ManagerProxy *proxy)
+logind_login1_manager_proxy_init (logindLogin1ManagerProxy *proxy)
 {
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  proxy->priv = login1_manager_proxy_get_instance_private (proxy);
+  proxy->priv = logind_login1_manager_proxy_get_instance_private (proxy);
 #else
-  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TYPE_LOGIN1_MANAGER_PROXY, Login1ManagerProxyPrivate);
+  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, LOGIND_TYPE_LOGIN1_MANAGER_PROXY, logindLogin1ManagerProxyPrivate);
 #endif
 
-  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), login1_manager_interface_info ());
+  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), logind_login1_manager_interface_info ());
 }
 
 static void
-login1_manager_proxy_class_init (Login1ManagerProxyClass *klass)
+logind_login1_manager_proxy_class_init (logindLogin1ManagerProxyClass *klass)
 {
   GObjectClass *gobject_class;
   GDBusProxyClass *proxy_class;
 
   gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize     = login1_manager_proxy_finalize;
-  gobject_class->get_property = login1_manager_proxy_get_property;
-  gobject_class->set_property = login1_manager_proxy_set_property;
+  gobject_class->finalize     = logind_login1_manager_proxy_finalize;
+  gobject_class->get_property = logind_login1_manager_proxy_get_property;
+  gobject_class->set_property = logind_login1_manager_proxy_set_property;
 
   proxy_class = G_DBUS_PROXY_CLASS (klass);
-  proxy_class->g_signal = login1_manager_proxy_g_signal;
-  proxy_class->g_properties_changed = login1_manager_proxy_g_properties_changed;
+  proxy_class->g_signal = logind_login1_manager_proxy_g_signal;
+  proxy_class->g_properties_changed = logind_login1_manager_proxy_g_properties_changed;
 
-  login1_manager_override_properties (gobject_class, 1);
+  logind_login1_manager_override_properties (gobject_class, 1);
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (Login1ManagerProxyPrivate));
+  g_type_class_add_private (klass, sizeof (logindLogin1ManagerProxyPrivate));
 #endif
 }
 
 static void
-login1_manager_proxy_iface_init (Login1ManagerIface *iface)
-{
-  iface->get_nauto_vts = login1_manager_proxy_get_nauto_vts;
-  iface->get_kill_only_users = login1_manager_proxy_get_kill_only_users;
-  iface->get_kill_exclude_users = login1_manager_proxy_get_kill_exclude_users;
-  iface->get_kill_user_processes = login1_manager_proxy_get_kill_user_processes;
-  iface->get_idle_hint = login1_manager_proxy_get_idle_hint;
-  iface->get_idle_since_hint = login1_manager_proxy_get_idle_since_hint;
-  iface->get_idle_since_hint_monotonic = login1_manager_proxy_get_idle_since_hint_monotonic;
-  iface->get_block_inhibited = login1_manager_proxy_get_block_inhibited;
-  iface->get_delay_inhibited = login1_manager_proxy_get_delay_inhibited;
-  iface->get_inhibit_delay_max_usec = login1_manager_proxy_get_inhibit_delay_max_usec;
-  iface->get_handle_power_key = login1_manager_proxy_get_handle_power_key;
-  iface->get_handle_suspend_key = login1_manager_proxy_get_handle_suspend_key;
-  iface->get_handle_hibernate_key = login1_manager_proxy_get_handle_hibernate_key;
-  iface->get_handle_lid_switch = login1_manager_proxy_get_handle_lid_switch;
-  iface->get_idle_action = login1_manager_proxy_get_idle_action;
-  iface->get_idle_action_usec = login1_manager_proxy_get_idle_action_usec;
-  iface->get_preparing_for_shutdown = login1_manager_proxy_get_preparing_for_shutdown;
-  iface->get_preparing_for_sleep = login1_manager_proxy_get_preparing_for_sleep;
-}
-
-/**
- * login1_manager_proxy_new:
+logind_login1_manager_proxy_iface_init (logindLogin1ManagerIface *iface)
+{
+  iface->get_nauto_vts = logind_login1_manager_proxy_get_nauto_vts;
+  iface->get_kill_only_users = logind_login1_manager_proxy_get_kill_only_users;
+  iface->get_kill_exclude_users = logind_login1_manager_proxy_get_kill_exclude_users;
+  iface->get_kill_user_processes = logind_login1_manager_proxy_get_kill_user_processes;
+  iface->get_idle_hint = logind_login1_manager_proxy_get_idle_hint;
+  iface->get_idle_since_hint = logind_login1_manager_proxy_get_idle_since_hint;
+  iface->get_idle_since_hint_monotonic = logind_login1_manager_proxy_get_idle_since_hint_monotonic;
+  iface->get_block_inhibited = logind_login1_manager_proxy_get_block_inhibited;
+  iface->get_delay_inhibited = logind_login1_manager_proxy_get_delay_inhibited;
+  iface->get_inhibit_delay_max_usec = logind_login1_manager_proxy_get_inhibit_delay_max_usec;
+  iface->get_handle_power_key = logind_login1_manager_proxy_get_handle_power_key;
+  iface->get_handle_suspend_key = logind_login1_manager_proxy_get_handle_suspend_key;
+  iface->get_handle_hibernate_key = logind_login1_manager_proxy_get_handle_hibernate_key;
+  iface->get_handle_lid_switch = logind_login1_manager_proxy_get_handle_lid_switch;
+  iface->get_idle_action = logind_login1_manager_proxy_get_idle_action;
+  iface->get_idle_action_usec = logind_login1_manager_proxy_get_idle_action_usec;
+  iface->get_preparing_for_shutdown = logind_login1_manager_proxy_get_preparing_for_shutdown;
+  iface->get_preparing_for_sleep = logind_login1_manager_proxy_get_preparing_for_sleep;
+}
+
+/**
+ * logind_login1_manager_proxy_new:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
@@ -9809,12 +9809,12 @@ login1_manager_proxy_iface_init (Login1ManagerIface *iface)
  * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-login1-Manager.top_of_page">org.freedesktop.login1.Manager</link>. See g_dbus_proxy_new() for more details.
  *
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_proxy_new_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_proxy_new_finish() to get the result of the operation.
  *
- * See login1_manager_proxy_new_sync() for the synchronous, blocking version of this constructor.
+ * See logind_login1_manager_proxy_new_sync() for the synchronous, blocking version of this constructor.
  */
 void
-login1_manager_proxy_new (
+logind_login1_manager_proxy_new (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -9823,20 +9823,20 @@ login1_manager_proxy_new (
     GAsyncReadyCallback  callback,
     gpointer             user_data)
 {
-  g_async_initable_new_async (TYPE_LOGIN1_MANAGER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.login1.Manager", NULL);
+  g_async_initable_new_async (LOGIND_TYPE_LOGIN1_MANAGER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.login1.Manager", NULL);
 }
 
 /**
- * login1_manager_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_proxy_new().
+ * logind_login1_manager_proxy_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_proxy_new().
  * @error: Return location for error or %NULL
  *
- * Finishes an operation started with login1_manager_proxy_new().
+ * Finishes an operation started with logind_login1_manager_proxy_new().
  *
- * Returns: (transfer full) (type Login1ManagerProxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type logindLogin1ManagerProxy): The constructed proxy object or %NULL if @error is set.
  */
-Login1Manager *
-login1_manager_proxy_new_finish (
+logindLogin1Manager *
+logind_login1_manager_proxy_new_finish (
     GAsyncResult        *res,
     GError             **error)
 {
@@ -9846,13 +9846,13 @@ login1_manager_proxy_new_finish (
   ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
   g_object_unref (source_object);
   if (ret != NULL)
-    return LOGIN1_MANAGER (ret);
+    return LOGIND_LOGIN1_MANAGER (ret);
   else
     return NULL;
 }
 
 /**
- * login1_manager_proxy_new_sync:
+ * logind_login1_manager_proxy_new_sync:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
@@ -9864,12 +9864,12 @@ login1_manager_proxy_new_finish (
  *
  * The calling thread is blocked until a reply is received.
  *
- * See login1_manager_proxy_new() for the asynchronous version of this constructor.
+ * See logind_login1_manager_proxy_new() for the asynchronous version of this constructor.
  *
- * Returns: (transfer full) (type Login1ManagerProxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type logindLogin1ManagerProxy): The constructed proxy object or %NULL if @error is set.
  */
-Login1Manager *
-login1_manager_proxy_new_sync (
+logindLogin1Manager *
+logind_login1_manager_proxy_new_sync (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -9878,16 +9878,16 @@ login1_manager_proxy_new_sync (
     GError             **error)
 {
   GInitable *ret;
-  ret = g_initable_new (TYPE_LOGIN1_MANAGER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.login1.Manager", NULL);
+  ret = g_initable_new (LOGIND_TYPE_LOGIN1_MANAGER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.login1.Manager", NULL);
   if (ret != NULL)
-    return LOGIN1_MANAGER (ret);
+    return LOGIND_LOGIN1_MANAGER (ret);
   else
     return NULL;
 }
 
 
 /**
- * login1_manager_proxy_new_for_bus:
+ * logind_login1_manager_proxy_new_for_bus:
  * @bus_type: A #GBusType.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: A bus name (well-known or unique).
@@ -9896,15 +9896,15 @@ login1_manager_proxy_new_sync (
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
  * @user_data: User data to pass to @callback.
  *
- * Like login1_manager_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
+ * Like logind_login1_manager_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
  *
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call login1_manager_proxy_new_for_bus_finish() to get the result of the operation.
+ * You can then call logind_login1_manager_proxy_new_for_bus_finish() to get the result of the operation.
  *
- * See login1_manager_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
+ * See logind_login1_manager_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
  */
 void
-login1_manager_proxy_new_for_bus (
+logind_login1_manager_proxy_new_for_bus (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -9913,20 +9913,20 @@ login1_manager_proxy_new_for_bus (
     GAsyncReadyCallback  callback,
     gpointer             user_data)
 {
-  g_async_initable_new_async (TYPE_LOGIN1_MANAGER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.login1.Manager", NULL);
+  g_async_initable_new_async (LOGIND_TYPE_LOGIN1_MANAGER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.login1.Manager", NULL);
 }
 
 /**
- * login1_manager_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to login1_manager_proxy_new_for_bus().
+ * logind_login1_manager_proxy_new_for_bus_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_login1_manager_proxy_new_for_bus().
  * @error: Return location for error or %NULL
  *
- * Finishes an operation started with login1_manager_proxy_new_for_bus().
+ * Finishes an operation started with logind_login1_manager_proxy_new_for_bus().
  *
- * Returns: (transfer full) (type Login1ManagerProxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type logindLogin1ManagerProxy): The constructed proxy object or %NULL if @error is set.
  */
-Login1Manager *
-login1_manager_proxy_new_for_bus_finish (
+logindLogin1Manager *
+logind_login1_manager_proxy_new_for_bus_finish (
     GAsyncResult        *res,
     GError             **error)
 {
@@ -9936,13 +9936,13 @@ login1_manager_proxy_new_for_bus_finish (
   ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
   g_object_unref (source_object);
   if (ret != NULL)
-    return LOGIN1_MANAGER (ret);
+    return LOGIND_LOGIN1_MANAGER (ret);
   else
     return NULL;
 }
 
 /**
- * login1_manager_proxy_new_for_bus_sync:
+ * logind_login1_manager_proxy_new_for_bus_sync:
  * @bus_type: A #GBusType.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: A bus name (well-known or unique).
@@ -9950,16 +9950,16 @@ login1_manager_proxy_new_for_bus_finish (
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL
  *
- * Like login1_manager_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
+ * Like logind_login1_manager_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
  *
  * The calling thread is blocked until a reply is received.
  *
- * See login1_manager_proxy_new_for_bus() for the asynchronous version of this constructor.
+ * See logind_login1_manager_proxy_new_for_bus() for the asynchronous version of this constructor.
  *
- * Returns: (transfer full) (type Login1ManagerProxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type logindLogin1ManagerProxy): The constructed proxy object or %NULL if @error is set.
  */
-Login1Manager *
-login1_manager_proxy_new_for_bus_sync (
+logindLogin1Manager *
+logind_login1_manager_proxy_new_for_bus_sync (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -9968,9 +9968,9 @@ login1_manager_proxy_new_for_bus_sync (
     GError             **error)
 {
   GInitable *ret;
-  ret = g_initable_new (TYPE_LOGIN1_MANAGER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.login1.Manager", NULL);
+  ret = g_initable_new (LOGIND_TYPE_LOGIN1_MANAGER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.login1.Manager", NULL);
   if (ret != NULL)
-    return LOGIN1_MANAGER (ret);
+    return LOGIND_LOGIN1_MANAGER (ret);
   else
     return NULL;
 }
@@ -9979,19 +9979,19 @@ login1_manager_proxy_new_for_bus_sync (
 /* ------------------------------------------------------------------------ */
 
 /**
- * Login1ManagerSkeleton:
+ * logindLogin1ManagerSkeleton:
  *
- * The #Login1ManagerSkeleton structure contains only private data and should only be accessed using the provided API.
+ * The #logindLogin1ManagerSkeleton structure contains only private data and should only be accessed using the provided API.
  */
 
 /**
- * Login1ManagerSkeletonClass:
+ * logindLogin1ManagerSkeletonClass:
  * @parent_class: The parent class.
  *
- * Class structure for #Login1ManagerSkeleton.
+ * Class structure for #logindLogin1ManagerSkeleton.
  */
 
-struct _Login1ManagerSkeletonPrivate
+struct _logindLogin1ManagerSkeletonPrivate
 {
   GValue *properties;
   GList *changed_properties;
@@ -10001,7 +10001,7 @@ struct _Login1ManagerSkeletonPrivate
 };
 
 static void
-_login1_manager_skeleton_handle_method_call (
+_logind_login1_manager_skeleton_handle_method_call (
   GDBusConnection *connection G_GNUC_UNUSED,
   const gchar *sender G_GNUC_UNUSED,
   const gchar *object_path G_GNUC_UNUSED,
@@ -10011,7 +10011,7 @@ _login1_manager_skeleton_handle_method_call (
   GDBusMethodInvocation *invocation,
   gpointer user_data)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (user_data);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (user_data);
   _ExtendedGDBusMethodInfo *info;
   GVariantIter iter;
   GVariant *child;
@@ -10026,7 +10026,7 @@ _login1_manager_skeleton_handle_method_call (
   num_params = g_variant_n_children (parameters);
   num_extra = info->pass_fdlist ? 3 : 2;  paramv = g_new0 (GValue, num_params + num_extra);
   n = 0;
-  g_value_init (&paramv[n], TYPE_LOGIN1_MANAGER);
+  g_value_init (&paramv[n], LOGIND_TYPE_LOGIN1_MANAGER);
   g_value_set_object (&paramv[n++], skeleton);
   g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
   g_value_set_object (&paramv[n++], invocation);
@@ -10053,7 +10053,7 @@ _login1_manager_skeleton_handle_method_call (
         g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
       g_variant_unref (child);
     }
-  signal_id = g_signal_lookup (info->signal_name, TYPE_LOGIN1_MANAGER);
+  signal_id = g_signal_lookup (info->signal_name, LOGIND_TYPE_LOGIN1_MANAGER);
   g_value_init (&return_value, G_TYPE_BOOLEAN);
   g_signal_emitv (paramv, signal_id, 0, &return_value);
   if (!g_value_get_boolean (&return_value))
@@ -10065,7 +10065,7 @@ _login1_manager_skeleton_handle_method_call (
 }
 
 static GVariant *
-_login1_manager_skeleton_handle_get_property (
+_logind_login1_manager_skeleton_handle_get_property (
   GDBusConnection *connection G_GNUC_UNUSED,
   const gchar *sender G_GNUC_UNUSED,
   const gchar *object_path G_GNUC_UNUSED,
@@ -10074,13 +10074,13 @@ _login1_manager_skeleton_handle_get_property (
   GError **error,
   gpointer user_data)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (user_data);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (user_data);
   GValue value = G_VALUE_INIT;
   GParamSpec *pspec;
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_login1_manager_interface_info.parent_struct, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_logind_login1_manager_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -10098,7 +10098,7 @@ _login1_manager_skeleton_handle_get_property (
 }
 
 static gboolean
-_login1_manager_skeleton_handle_set_property (
+_logind_login1_manager_skeleton_handle_set_property (
   GDBusConnection *connection G_GNUC_UNUSED,
   const gchar *sender G_GNUC_UNUSED,
   const gchar *object_path G_GNUC_UNUSED,
@@ -10108,13 +10108,13 @@ _login1_manager_skeleton_handle_set_property (
   GError **error,
   gpointer user_data)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (user_data);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (user_data);
   GValue value = G_VALUE_INIT;
   GParamSpec *pspec;
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_login1_manager_interface_info.parent_struct, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_logind_login1_manager_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -10134,43 +10134,43 @@ _login1_manager_skeleton_handle_set_property (
   return ret;
 }
 
-static const GDBusInterfaceVTable _login1_manager_skeleton_vtable =
+static const GDBusInterfaceVTable _logind_login1_manager_skeleton_vtable =
 {
-  _login1_manager_skeleton_handle_method_call,
-  _login1_manager_skeleton_handle_get_property,
-  _login1_manager_skeleton_handle_set_property,
+  _logind_login1_manager_skeleton_handle_method_call,
+  _logind_login1_manager_skeleton_handle_get_property,
+  _logind_login1_manager_skeleton_handle_set_property,
   {NULL}
 };
 
 static GDBusInterfaceInfo *
-login1_manager_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
+logind_login1_manager_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
 {
-  return login1_manager_interface_info ();
+  return logind_login1_manager_interface_info ();
 }
 
 static GDBusInterfaceVTable *
-login1_manager_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
+logind_login1_manager_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
 {
-  return (GDBusInterfaceVTable *) &_login1_manager_skeleton_vtable;
+  return (GDBusInterfaceVTable *) &_logind_login1_manager_skeleton_vtable;
 }
 
 static GVariant *
-login1_manager_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
+logind_login1_manager_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (_skeleton);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (_skeleton);
 
   GVariantBuilder builder;
   guint n;
   g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
-  if (_login1_manager_interface_info.parent_struct.properties == NULL)
+  if (_logind_login1_manager_interface_info.parent_struct.properties == NULL)
     goto out;
-  for (n = 0; _login1_manager_interface_info.parent_struct.properties[n] != NULL; n++)
+  for (n = 0; _logind_login1_manager_interface_info.parent_struct.properties[n] != NULL; n++)
     {
-      GDBusPropertyInfo *info = _login1_manager_interface_info.parent_struct.properties[n];
+      GDBusPropertyInfo *info = _logind_login1_manager_interface_info.parent_struct.properties[n];
       if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
         {
           GVariant *value;
-          value = _login1_manager_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.login1.Manager", info->name, NULL, skeleton);
+          value = _logind_login1_manager_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.login1.Manager", info->name, NULL, skeleton);
           if (value != NULL)
             {
               g_variant_take_ref (value);
@@ -10183,12 +10183,12 @@ out:
   return g_variant_builder_end (&builder);
 }
 
-static gboolean _login1_manager_emit_changed (gpointer user_data);
+static gboolean _logind_login1_manager_emit_changed (gpointer user_data);
 
 static void
-login1_manager_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
+logind_login1_manager_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (_skeleton);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (_skeleton);
   gboolean emit_changed = FALSE;
 
   g_mutex_lock (&skeleton->priv->lock);
@@ -10201,16 +10201,16 @@ login1_manager_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
   g_mutex_unlock (&skeleton->priv->lock);
 
   if (emit_changed)
-    _login1_manager_emit_changed (skeleton);
+    _logind_login1_manager_emit_changed (skeleton);
 }
 
 static void
-_login1_manager_on_signal_session_new (
-    Login1Manager *object,
+_logind_login1_manager_on_signal_session_new (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
 
   GList      *connections, *l;
   GVariant   *signal_variant;
@@ -10231,12 +10231,12 @@ _login1_manager_on_signal_session_new (
 }
 
 static void
-_login1_manager_on_signal_session_removed (
-    Login1Manager *object,
+_logind_login1_manager_on_signal_session_removed (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
 
   GList      *connections, *l;
   GVariant   *signal_variant;
@@ -10257,12 +10257,12 @@ _login1_manager_on_signal_session_removed (
 }
 
 static void
-_login1_manager_on_signal_user_new (
-    Login1Manager *object,
+_logind_login1_manager_on_signal_user_new (
+    logindLogin1Manager *object,
     guint arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
 
   GList      *connections, *l;
   GVariant   *signal_variant;
@@ -10283,12 +10283,12 @@ _login1_manager_on_signal_user_new (
 }
 
 static void
-_login1_manager_on_signal_user_removed (
-    Login1Manager *object,
+_logind_login1_manager_on_signal_user_removed (
+    logindLogin1Manager *object,
     guint arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
 
   GList      *connections, *l;
   GVariant   *signal_variant;
@@ -10309,12 +10309,12 @@ _login1_manager_on_signal_user_removed (
 }
 
 static void
-_login1_manager_on_signal_seat_new (
-    Login1Manager *object,
+_logind_login1_manager_on_signal_seat_new (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
 
   GList      *connections, *l;
   GVariant   *signal_variant;
@@ -10335,12 +10335,12 @@ _login1_manager_on_signal_seat_new (
 }
 
 static void
-_login1_manager_on_signal_seat_removed (
-    Login1Manager *object,
+_logind_login1_manager_on_signal_seat_removed (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
 
   GList      *connections, *l;
   GVariant   *signal_variant;
@@ -10361,11 +10361,11 @@ _login1_manager_on_signal_seat_removed (
 }
 
 static void
-_login1_manager_on_signal_prepare_for_shutdown (
-    Login1Manager *object,
+_logind_login1_manager_on_signal_prepare_for_shutdown (
+    logindLogin1Manager *object,
     gboolean arg_unnamed_arg0)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
 
   GList      *connections, *l;
   GVariant   *signal_variant;
@@ -10385,11 +10385,11 @@ _login1_manager_on_signal_prepare_for_shutdown (
 }
 
 static void
-_login1_manager_on_signal_prepare_for_sleep (
-    Login1Manager *object,
+_logind_login1_manager_on_signal_prepare_for_sleep (
+    logindLogin1Manager *object,
     gboolean arg_unnamed_arg0)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
 
   GList      *connections, *l;
   GVariant   *signal_variant;
@@ -10408,21 +10408,21 @@ _login1_manager_on_signal_prepare_for_sleep (
   g_list_free_full (connections, g_object_unref);
 }
 
-static void login1_manager_skeleton_iface_init (Login1ManagerIface *iface);
+static void logind_login1_manager_skeleton_iface_init (logindLogin1ManagerIface *iface);
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (Login1ManagerSkeleton, login1_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_ADD_PRIVATE (Login1ManagerSkeleton)
-                         G_IMPLEMENT_INTERFACE (TYPE_LOGIN1_MANAGER, login1_manager_skeleton_iface_init));
+G_DEFINE_TYPE_WITH_CODE (logindLogin1ManagerSkeleton, logind_login1_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+                         G_ADD_PRIVATE (logindLogin1ManagerSkeleton)
+                         G_IMPLEMENT_INTERFACE (LOGIND_TYPE_LOGIN1_MANAGER, logind_login1_manager_skeleton_iface_init));
 
 #else
-G_DEFINE_TYPE_WITH_CODE (Login1ManagerSkeleton, login1_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_IMPLEMENT_INTERFACE (TYPE_LOGIN1_MANAGER, login1_manager_skeleton_iface_init));
+G_DEFINE_TYPE_WITH_CODE (logindLogin1ManagerSkeleton, logind_login1_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+                         G_IMPLEMENT_INTERFACE (LOGIND_TYPE_LOGIN1_MANAGER, logind_login1_manager_skeleton_iface_init));
 
 #endif
 static void
-login1_manager_skeleton_finalize (GObject *object)
+logind_login1_manager_skeleton_finalize (GObject *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   guint n;
   for (n = 0; n < 18; n++)
     g_value_unset (&skeleton->priv->properties[n]);
@@ -10432,16 +10432,16 @@ login1_manager_skeleton_finalize (GObject *object)
     g_source_destroy (skeleton->priv->changed_properties_idle_source);
   g_main_context_unref (skeleton->priv->context);
   g_mutex_clear (&skeleton->priv->lock);
-  G_OBJECT_CLASS (login1_manager_skeleton_parent_class)->finalize (object);
+  G_OBJECT_CLASS (logind_login1_manager_skeleton_parent_class)->finalize (object);
 }
 
 static void
-login1_manager_skeleton_get_property (GObject      *object,
+logind_login1_manager_skeleton_get_property (GObject      *object,
   guint         prop_id,
   GValue       *value,
   GParamSpec   *pspec G_GNUC_UNUSED)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   g_assert (prop_id != 0 && prop_id - 1 < 18);
   g_mutex_lock (&skeleton->priv->lock);
   g_value_copy (&skeleton->priv->properties[prop_id - 1], value);
@@ -10449,9 +10449,9 @@ login1_manager_skeleton_get_property (GObject      *object,
 }
 
 static gboolean
-_login1_manager_emit_changed (gpointer user_data)
+_logind_login1_manager_emit_changed (gpointer user_data)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (user_data);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (user_data);
   GList *l;
   GVariantBuilder builder;
   GVariantBuilder invalidated_builder;
@@ -10509,7 +10509,7 @@ _login1_manager_emit_changed (gpointer user_data)
 }
 
 static void
-_login1_manager_schedule_emit_changed (Login1ManagerSkeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
+_logind_login1_manager_schedule_emit_changed (logindLogin1ManagerSkeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
 {
   ChangedProperty *cp;
   GList *l;
@@ -10535,17 +10535,17 @@ _login1_manager_schedule_emit_changed (Login1ManagerSkeleton *skeleton, const _E
 }
 
 static void
-login1_manager_skeleton_notify (GObject      *object,
+logind_login1_manager_skeleton_notify (GObject      *object,
   GParamSpec *pspec G_GNUC_UNUSED)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   g_mutex_lock (&skeleton->priv->lock);
   if (skeleton->priv->changed_properties != NULL &&
       skeleton->priv->changed_properties_idle_source == NULL)
     {
       skeleton->priv->changed_properties_idle_source = g_idle_source_new ();
       g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);
-      g_source_set_callback (skeleton->priv->changed_properties_idle_source, _login1_manager_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
+      g_source_set_callback (skeleton->priv->changed_properties_idle_source, _logind_login1_manager_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
       g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);
       g_source_unref (skeleton->priv->changed_properties_idle_source);
     }
@@ -10553,19 +10553,19 @@ login1_manager_skeleton_notify (GObject      *object,
 }
 
 static void
-login1_manager_skeleton_set_property (GObject      *object,
+logind_login1_manager_skeleton_set_property (GObject      *object,
   guint         prop_id,
   const GValue *value,
   GParamSpec   *pspec)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   g_assert (prop_id != 0 && prop_id - 1 < 18);
   g_mutex_lock (&skeleton->priv->lock);
   g_object_freeze_notify (object);
   if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1]))
     {
       if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)
-        _login1_manager_schedule_emit_changed (skeleton, _login1_manager_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]);
+        _logind_login1_manager_schedule_emit_changed (skeleton, _logind_login1_manager_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]);
       g_value_copy (value, &skeleton->priv->properties[prop_id - 1]);
       g_object_notify_by_pspec (object, pspec);
     }
@@ -10574,12 +10574,12 @@ login1_manager_skeleton_set_property (GObject      *object,
 }
 
 static void
-login1_manager_skeleton_init (Login1ManagerSkeleton *skeleton)
+logind_login1_manager_skeleton_init (logindLogin1ManagerSkeleton *skeleton)
 {
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  skeleton->priv = login1_manager_skeleton_get_instance_private (skeleton);
+  skeleton->priv = logind_login1_manager_skeleton_get_instance_private (skeleton);
 #else
-  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TYPE_LOGIN1_MANAGER_SKELETON, Login1ManagerSkeletonPrivate);
+  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, LOGIND_TYPE_LOGIN1_MANAGER_SKELETON, logindLogin1ManagerSkeletonPrivate);
 #endif
 
   g_mutex_init (&skeleton->priv->lock);
@@ -10606,9 +10606,9 @@ login1_manager_skeleton_init (Login1ManagerSkeleton *skeleton)
 }
 
 static guint 
-login1_manager_skeleton_get_nauto_vts (Login1Manager *object)
+logind_login1_manager_skeleton_get_nauto_vts (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   guint value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_uint (&(skeleton->priv->properties[0]));
@@ -10617,9 +10617,9 @@ login1_manager_skeleton_get_nauto_vts (Login1Manager *object)
 }
 
 static const gchar *const *
-login1_manager_skeleton_get_kill_only_users (Login1Manager *object)
+logind_login1_manager_skeleton_get_kill_only_users (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   const gchar *const *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_boxed (&(skeleton->priv->properties[1]));
@@ -10628,9 +10628,9 @@ login1_manager_skeleton_get_kill_only_users (Login1Manager *object)
 }
 
 static const gchar *const *
-login1_manager_skeleton_get_kill_exclude_users (Login1Manager *object)
+logind_login1_manager_skeleton_get_kill_exclude_users (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   const gchar *const *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_boxed (&(skeleton->priv->properties[2]));
@@ -10639,9 +10639,9 @@ login1_manager_skeleton_get_kill_exclude_users (Login1Manager *object)
 }
 
 static gboolean 
-login1_manager_skeleton_get_kill_user_processes (Login1Manager *object)
+logind_login1_manager_skeleton_get_kill_user_processes (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   gboolean value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_boolean (&(skeleton->priv->properties[3]));
@@ -10650,9 +10650,9 @@ login1_manager_skeleton_get_kill_user_processes (Login1Manager *object)
 }
 
 static gboolean 
-login1_manager_skeleton_get_idle_hint (Login1Manager *object)
+logind_login1_manager_skeleton_get_idle_hint (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   gboolean value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_boolean (&(skeleton->priv->properties[4]));
@@ -10661,9 +10661,9 @@ login1_manager_skeleton_get_idle_hint (Login1Manager *object)
 }
 
 static guint64 
-login1_manager_skeleton_get_idle_since_hint (Login1Manager *object)
+logind_login1_manager_skeleton_get_idle_since_hint (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   guint64 value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_uint64 (&(skeleton->priv->properties[5]));
@@ -10672,9 +10672,9 @@ login1_manager_skeleton_get_idle_since_hint (Login1Manager *object)
 }
 
 static guint64 
-login1_manager_skeleton_get_idle_since_hint_monotonic (Login1Manager *object)
+logind_login1_manager_skeleton_get_idle_since_hint_monotonic (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   guint64 value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_uint64 (&(skeleton->priv->properties[6]));
@@ -10683,9 +10683,9 @@ login1_manager_skeleton_get_idle_since_hint_monotonic (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_skeleton_get_block_inhibited (Login1Manager *object)
+logind_login1_manager_skeleton_get_block_inhibited (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[7]));
@@ -10694,9 +10694,9 @@ login1_manager_skeleton_get_block_inhibited (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_skeleton_get_delay_inhibited (Login1Manager *object)
+logind_login1_manager_skeleton_get_delay_inhibited (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[8]));
@@ -10705,9 +10705,9 @@ login1_manager_skeleton_get_delay_inhibited (Login1Manager *object)
 }
 
 static guint64 
-login1_manager_skeleton_get_inhibit_delay_max_usec (Login1Manager *object)
+logind_login1_manager_skeleton_get_inhibit_delay_max_usec (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   guint64 value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_uint64 (&(skeleton->priv->properties[9]));
@@ -10716,9 +10716,9 @@ login1_manager_skeleton_get_inhibit_delay_max_usec (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_skeleton_get_handle_power_key (Login1Manager *object)
+logind_login1_manager_skeleton_get_handle_power_key (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[10]));
@@ -10727,9 +10727,9 @@ login1_manager_skeleton_get_handle_power_key (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_skeleton_get_handle_suspend_key (Login1Manager *object)
+logind_login1_manager_skeleton_get_handle_suspend_key (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[11]));
@@ -10738,9 +10738,9 @@ login1_manager_skeleton_get_handle_suspend_key (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_skeleton_get_handle_hibernate_key (Login1Manager *object)
+logind_login1_manager_skeleton_get_handle_hibernate_key (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[12]));
@@ -10749,9 +10749,9 @@ login1_manager_skeleton_get_handle_hibernate_key (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_skeleton_get_handle_lid_switch (Login1Manager *object)
+logind_login1_manager_skeleton_get_handle_lid_switch (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[13]));
@@ -10760,9 +10760,9 @@ login1_manager_skeleton_get_handle_lid_switch (Login1Manager *object)
 }
 
 static const gchar *
-login1_manager_skeleton_get_idle_action (Login1Manager *object)
+logind_login1_manager_skeleton_get_idle_action (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[14]));
@@ -10771,9 +10771,9 @@ login1_manager_skeleton_get_idle_action (Login1Manager *object)
 }
 
 static guint64 
-login1_manager_skeleton_get_idle_action_usec (Login1Manager *object)
+logind_login1_manager_skeleton_get_idle_action_usec (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   guint64 value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_uint64 (&(skeleton->priv->properties[15]));
@@ -10782,9 +10782,9 @@ login1_manager_skeleton_get_idle_action_usec (Login1Manager *object)
 }
 
 static gboolean 
-login1_manager_skeleton_get_preparing_for_shutdown (Login1Manager *object)
+logind_login1_manager_skeleton_get_preparing_for_shutdown (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   gboolean value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_boolean (&(skeleton->priv->properties[16]));
@@ -10793,9 +10793,9 @@ login1_manager_skeleton_get_preparing_for_shutdown (Login1Manager *object)
 }
 
 static gboolean 
-login1_manager_skeleton_get_preparing_for_sleep (Login1Manager *object)
+logind_login1_manager_skeleton_get_preparing_for_sleep (logindLogin1Manager *object)
 {
-  Login1ManagerSkeleton *skeleton = LOGIN1_MANAGER_SKELETON (object);
+  logindLogin1ManagerSkeleton *skeleton = LOGIND_LOGIN1_MANAGER_SKELETON (object);
   gboolean value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_boolean (&(skeleton->priv->properties[17]));
@@ -10804,72 +10804,636 @@ login1_manager_skeleton_get_preparing_for_sleep (Login1Manager *object)
 }
 
 static void
-login1_manager_skeleton_class_init (Login1ManagerSkeletonClass *klass)
+logind_login1_manager_skeleton_class_init (logindLogin1ManagerSkeletonClass *klass)
 {
   GObjectClass *gobject_class;
   GDBusInterfaceSkeletonClass *skeleton_class;
 
   gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = login1_manager_skeleton_finalize;
-  gobject_class->get_property = login1_manager_skeleton_get_property;
-  gobject_class->set_property = login1_manager_skeleton_set_property;
-  gobject_class->notify       = login1_manager_skeleton_notify;
+  gobject_class->finalize = logind_login1_manager_skeleton_finalize;
+  gobject_class->get_property = logind_login1_manager_skeleton_get_property;
+  gobject_class->set_property = logind_login1_manager_skeleton_set_property;
+  gobject_class->notify       = logind_login1_manager_skeleton_notify;
 
 
-  login1_manager_override_properties (gobject_class, 1);
+  logind_login1_manager_override_properties (gobject_class, 1);
 
   skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
-  skeleton_class->get_info = login1_manager_skeleton_dbus_interface_get_info;
-  skeleton_class->get_properties = login1_manager_skeleton_dbus_interface_get_properties;
-  skeleton_class->flush = login1_manager_skeleton_dbus_interface_flush;
-  skeleton_class->get_vtable = login1_manager_skeleton_dbus_interface_get_vtable;
+  skeleton_class->get_info = logind_login1_manager_skeleton_dbus_interface_get_info;
+  skeleton_class->get_properties = logind_login1_manager_skeleton_dbus_interface_get_properties;
+  skeleton_class->flush = logind_login1_manager_skeleton_dbus_interface_flush;
+  skeleton_class->get_vtable = logind_login1_manager_skeleton_dbus_interface_get_vtable;
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (Login1ManagerSkeletonPrivate));
+  g_type_class_add_private (klass, sizeof (logindLogin1ManagerSkeletonPrivate));
 #endif
 }
 
 static void
-login1_manager_skeleton_iface_init (Login1ManagerIface *iface)
-{
-  iface->session_new = _login1_manager_on_signal_session_new;
-  iface->session_removed = _login1_manager_on_signal_session_removed;
-  iface->user_new = _login1_manager_on_signal_user_new;
-  iface->user_removed = _login1_manager_on_signal_user_removed;
-  iface->seat_new = _login1_manager_on_signal_seat_new;
-  iface->seat_removed = _login1_manager_on_signal_seat_removed;
-  iface->prepare_for_shutdown = _login1_manager_on_signal_prepare_for_shutdown;
-  iface->prepare_for_sleep = _login1_manager_on_signal_prepare_for_sleep;
-  iface->get_nauto_vts = login1_manager_skeleton_get_nauto_vts;
-  iface->get_kill_only_users = login1_manager_skeleton_get_kill_only_users;
-  iface->get_kill_exclude_users = login1_manager_skeleton_get_kill_exclude_users;
-  iface->get_kill_user_processes = login1_manager_skeleton_get_kill_user_processes;
-  iface->get_idle_hint = login1_manager_skeleton_get_idle_hint;
-  iface->get_idle_since_hint = login1_manager_skeleton_get_idle_since_hint;
-  iface->get_idle_since_hint_monotonic = login1_manager_skeleton_get_idle_since_hint_monotonic;
-  iface->get_block_inhibited = login1_manager_skeleton_get_block_inhibited;
-  iface->get_delay_inhibited = login1_manager_skeleton_get_delay_inhibited;
-  iface->get_inhibit_delay_max_usec = login1_manager_skeleton_get_inhibit_delay_max_usec;
-  iface->get_handle_power_key = login1_manager_skeleton_get_handle_power_key;
-  iface->get_handle_suspend_key = login1_manager_skeleton_get_handle_suspend_key;
-  iface->get_handle_hibernate_key = login1_manager_skeleton_get_handle_hibernate_key;
-  iface->get_handle_lid_switch = login1_manager_skeleton_get_handle_lid_switch;
-  iface->get_idle_action = login1_manager_skeleton_get_idle_action;
-  iface->get_idle_action_usec = login1_manager_skeleton_get_idle_action_usec;
-  iface->get_preparing_for_shutdown = login1_manager_skeleton_get_preparing_for_shutdown;
-  iface->get_preparing_for_sleep = login1_manager_skeleton_get_preparing_for_sleep;
-}
-
-/**
- * login1_manager_skeleton_new:
+logind_login1_manager_skeleton_iface_init (logindLogin1ManagerIface *iface)
+{
+  iface->session_new = _logind_login1_manager_on_signal_session_new;
+  iface->session_removed = _logind_login1_manager_on_signal_session_removed;
+  iface->user_new = _logind_login1_manager_on_signal_user_new;
+  iface->user_removed = _logind_login1_manager_on_signal_user_removed;
+  iface->seat_new = _logind_login1_manager_on_signal_seat_new;
+  iface->seat_removed = _logind_login1_manager_on_signal_seat_removed;
+  iface->prepare_for_shutdown = _logind_login1_manager_on_signal_prepare_for_shutdown;
+  iface->prepare_for_sleep = _logind_login1_manager_on_signal_prepare_for_sleep;
+  iface->get_nauto_vts = logind_login1_manager_skeleton_get_nauto_vts;
+  iface->get_kill_only_users = logind_login1_manager_skeleton_get_kill_only_users;
+  iface->get_kill_exclude_users = logind_login1_manager_skeleton_get_kill_exclude_users;
+  iface->get_kill_user_processes = logind_login1_manager_skeleton_get_kill_user_processes;
+  iface->get_idle_hint = logind_login1_manager_skeleton_get_idle_hint;
+  iface->get_idle_since_hint = logind_login1_manager_skeleton_get_idle_since_hint;
+  iface->get_idle_since_hint_monotonic = logind_login1_manager_skeleton_get_idle_since_hint_monotonic;
+  iface->get_block_inhibited = logind_login1_manager_skeleton_get_block_inhibited;
+  iface->get_delay_inhibited = logind_login1_manager_skeleton_get_delay_inhibited;
+  iface->get_inhibit_delay_max_usec = logind_login1_manager_skeleton_get_inhibit_delay_max_usec;
+  iface->get_handle_power_key = logind_login1_manager_skeleton_get_handle_power_key;
+  iface->get_handle_suspend_key = logind_login1_manager_skeleton_get_handle_suspend_key;
+  iface->get_handle_hibernate_key = logind_login1_manager_skeleton_get_handle_hibernate_key;
+  iface->get_handle_lid_switch = logind_login1_manager_skeleton_get_handle_lid_switch;
+  iface->get_idle_action = logind_login1_manager_skeleton_get_idle_action;
+  iface->get_idle_action_usec = logind_login1_manager_skeleton_get_idle_action_usec;
+  iface->get_preparing_for_shutdown = logind_login1_manager_skeleton_get_preparing_for_shutdown;
+  iface->get_preparing_for_sleep = logind_login1_manager_skeleton_get_preparing_for_sleep;
+}
+
+/**
+ * logind_login1_manager_skeleton_new:
  *
  * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-login1-Manager.top_of_page">org.freedesktop.login1.Manager</link>.
  *
- * Returns: (transfer full) (type Login1ManagerSkeleton): The skeleton object.
+ * Returns: (transfer full) (type logindLogin1ManagerSkeleton): The skeleton object.
  */
-Login1Manager *
-login1_manager_skeleton_new (void)
+logindLogin1Manager *
+logind_login1_manager_skeleton_new (void)
 {
-  return LOGIN1_MANAGER (g_object_new (TYPE_LOGIN1_MANAGER_SKELETON, NULL));
+  return LOGIND_LOGIN1_MANAGER (g_object_new (LOGIND_TYPE_LOGIN1_MANAGER_SKELETON, NULL));
 }
 
+/* ------------------------------------------------------------------------
+ * Code for Object, ObjectProxy and ObjectSkeleton
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * SECTION:logindObject
+ * @title: logindObject
+ * @short_description: Specialized GDBusObject types
+ *
+ * This section contains the #logindObject, #logindObjectProxy, and #logindObjectSkeleton types which make it easier to work with objects implementing generated types for D-Bus interfaces.
+ */
+
+/**
+ * logindObject:
+ *
+ * The #logindObject type is a specialized container of interfaces.
+ */
+
+/**
+ * logindObjectIface:
+ * @parent_iface: The parent interface.
+ *
+ * Virtual table for the #logindObject interface.
+ */
+
+typedef logindObjectIface logindObjectInterface;
+G_DEFINE_INTERFACE_WITH_CODE (logindObject, logind_object, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));
+
+static void
+logind_object_default_init (logindObjectIface *iface)
+{
+  /**
+   * logindObject:login1-manager:
+   *
+   * The #logindLogin1Manager instance corresponding to the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-login1-Manager.top_of_page">org.freedesktop.login1.Manager</link>, if any.
+   *
+   * Connect to the #GObject::notify signal to get informed of property changes.
+   */
+  g_object_interface_install_property (iface, g_param_spec_object ("login1-manager", "login1-manager", "login1-manager", LOGIND_TYPE_LOGIN1_MANAGER, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));
+
+}
+
+/**
+ * logind_object_get_login1_manager:
+ * @object: A #logindObject.
+ *
+ * Gets the #logindLogin1Manager instance for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-login1-Manager.top_of_page">org.freedesktop.login1.Manager</link> on @object, if any.
+ *
+ * Returns: (transfer full): A #logindLogin1Manager that must be freed with g_object_unref() or %NULL if @object does not implement the interface.
+ */
+logindLogin1Manager *logind_object_get_login1_manager (logindObject *object)
+{
+  GDBusInterface *ret;
+  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.login1.Manager");
+  if (ret == NULL)
+    return NULL;
+  return LOGIND_LOGIN1_MANAGER (ret);
+}
+
+
+/**
+ * logind_object_peek_login1_manager: (skip)
+ * @object: A #logindObject.
+ *
+ * Like logind_object_get_login1_manager() but doesn't increase the reference count on the returned object.
+ *
+ * <warning>It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running.</warning>
+ *
+ * Returns: (transfer none): A #logindLogin1Manager or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object.
+ */
+logindLogin1Manager *logind_object_peek_login1_manager (logindObject *object)
+{
+  GDBusInterface *ret;
+  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.login1.Manager");
+  if (ret == NULL)
+    return NULL;
+  g_object_unref (ret);
+  return LOGIND_LOGIN1_MANAGER (ret);
+}
+
+
+static void
+logind_object_notify (GDBusObject *object, GDBusInterface *interface)
+{
+  _ExtendedGDBusInterfaceInfo *info = (_ExtendedGDBusInterfaceInfo *) g_dbus_interface_get_info (interface);
+  /* info can be NULL if the other end is using a D-Bus interface we don't know
+   * anything about, for example old generated code in this process talking to
+   * newer generated code in the other process. */
+  if (info != NULL)
+    g_object_notify (G_OBJECT (object), info->hyphen_name);
+}
+
+/**
+ * logindObjectProxy:
+ *
+ * The #logindObjectProxy structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * logindObjectProxyClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #logindObjectProxy.
+ */
+
+static void
+logind_object_proxy__logind_object_iface_init (logindObjectIface *iface G_GNUC_UNUSED)
+{
+}
+
+static void
+logind_object_proxy__g_dbus_object_iface_init (GDBusObjectIface *iface)
+{
+  iface->interface_added = logind_object_notify;
+  iface->interface_removed = logind_object_notify;
+}
+
+
+G_DEFINE_TYPE_WITH_CODE (logindObjectProxy, logind_object_proxy, G_TYPE_DBUS_OBJECT_PROXY,
+                         G_IMPLEMENT_INTERFACE (LOGIND_TYPE_OBJECT, logind_object_proxy__logind_object_iface_init)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, logind_object_proxy__g_dbus_object_iface_init));
+
+static void
+logind_object_proxy_init (logindObjectProxy *object G_GNUC_UNUSED)
+{
+}
+
+static void
+logind_object_proxy_set_property (GObject      *gobject,
+  guint         prop_id,
+  const GValue *value G_GNUC_UNUSED,
+  GParamSpec   *pspec)
+{
+  G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+}
+
+static void
+logind_object_proxy_get_property (GObject      *gobject,
+  guint         prop_id,
+  GValue       *value,
+  GParamSpec   *pspec)
+{
+  logindObjectProxy *object = LOGIND_OBJECT_PROXY (gobject);
+  GDBusInterface *interface;
+
+  switch (prop_id)
+    {
+    case 1:
+      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.login1.Manager");
+      g_value_take_object (value, interface);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+logind_object_proxy_class_init (logindObjectProxyClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = logind_object_proxy_set_property;
+  gobject_class->get_property = logind_object_proxy_get_property;
+
+  g_object_class_override_property (gobject_class, 1, "login1-manager");
+}
+
+/**
+ * logind_object_proxy_new:
+ * @connection: A #GDBusConnection.
+ * @object_path: An object path.
+ *
+ * Creates a new proxy object.
+ *
+ * Returns: (transfer full): The proxy object.
+ */
+logindObjectProxy *
+logind_object_proxy_new (GDBusConnection *connection,
+  const gchar *object_path)
+{
+  g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
+  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
+  return LOGIND_OBJECT_PROXY (g_object_new (LOGIND_TYPE_OBJECT_PROXY, "g-connection", connection, "g-object-path", object_path, NULL));
+}
+
+/**
+ * logindObjectSkeleton:
+ *
+ * The #logindObjectSkeleton structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * logindObjectSkeletonClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #logindObjectSkeleton.
+ */
+
+static void
+logind_object_skeleton__logind_object_iface_init (logindObjectIface *iface G_GNUC_UNUSED)
+{
+}
+
+
+static void
+logind_object_skeleton__g_dbus_object_iface_init (GDBusObjectIface *iface)
+{
+  iface->interface_added = logind_object_notify;
+  iface->interface_removed = logind_object_notify;
+}
+
+G_DEFINE_TYPE_WITH_CODE (logindObjectSkeleton, logind_object_skeleton, G_TYPE_DBUS_OBJECT_SKELETON,
+                         G_IMPLEMENT_INTERFACE (LOGIND_TYPE_OBJECT, logind_object_skeleton__logind_object_iface_init)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, logind_object_skeleton__g_dbus_object_iface_init));
+
+static void
+logind_object_skeleton_init (logindObjectSkeleton *object G_GNUC_UNUSED)
+{
+}
+
+static void
+logind_object_skeleton_set_property (GObject      *gobject,
+  guint         prop_id,
+  const GValue *value,
+  GParamSpec   *pspec)
+{
+  logindObjectSkeleton *object = LOGIND_OBJECT_SKELETON (gobject);
+  GDBusInterfaceSkeleton *interface;
+
+  switch (prop_id)
+    {
+    case 1:
+      interface = g_value_get_object (value);
+      if (interface != NULL)
+        {
+          g_warn_if_fail (LOGIND_IS_LOGIN1_MANAGER (interface));
+          g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (object), interface);
+        }
+      else
+        {
+          g_dbus_object_skeleton_remove_interface_by_name (G_DBUS_OBJECT_SKELETON (object), "org.freedesktop.login1.Manager");
+        }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+logind_object_skeleton_get_property (GObject      *gobject,
+  guint         prop_id,
+  GValue       *value,
+  GParamSpec   *pspec)
+{
+  logindObjectSkeleton *object = LOGIND_OBJECT_SKELETON (gobject);
+  GDBusInterface *interface;
+
+  switch (prop_id)
+    {
+    case 1:
+      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.login1.Manager");
+      g_value_take_object (value, interface);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+logind_object_skeleton_class_init (logindObjectSkeletonClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = logind_object_skeleton_set_property;
+  gobject_class->get_property = logind_object_skeleton_get_property;
+
+  g_object_class_override_property (gobject_class, 1, "login1-manager");
+}
+
+/**
+ * logind_object_skeleton_new:
+ * @object_path: An object path.
+ *
+ * Creates a new skeleton object.
+ *
+ * Returns: (transfer full): The skeleton object.
+ */
+logindObjectSkeleton *
+logind_object_skeleton_new (const gchar *object_path)
+{
+  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
+  return LOGIND_OBJECT_SKELETON (g_object_new (LOGIND_TYPE_OBJECT_SKELETON, "g-object-path", object_path, NULL));
+}
+
+/**
+ * logind_object_skeleton_set_login1_manager:
+ * @object: A #logindObjectSkeleton.
+ * @interface_: (allow-none): A #logindLogin1Manager or %NULL to clear the interface.
+ *
+ * Sets the #logindLogin1Manager instance for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-login1-Manager.top_of_page">org.freedesktop.login1.Manager</link> on @object.
+ */
+void logind_object_skeleton_set_login1_manager (logindObjectSkeleton *object, logindLogin1Manager *interface_)
+{
+  g_object_set (G_OBJECT (object), "login1-manager", interface_, NULL);
+}
+
+
+/* ------------------------------------------------------------------------
+ * Code for ObjectManager client
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * SECTION:logindObjectManagerClient
+ * @title: logindObjectManagerClient
+ * @short_description: Generated GDBusObjectManagerClient type
+ *
+ * This section contains a #GDBusObjectManagerClient that uses logind_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc.
+ */
+
+/**
+ * logindObjectManagerClient:
+ *
+ * The #logindObjectManagerClient structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * logindObjectManagerClientClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #logindObjectManagerClient.
+ */
+
+G_DEFINE_TYPE (logindObjectManagerClient, logind_object_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT);
+
+static void
+logind_object_manager_client_init (logindObjectManagerClient *manager G_GNUC_UNUSED)
+{
+}
+
+static void
+logind_object_manager_client_class_init (logindObjectManagerClientClass *klass G_GNUC_UNUSED)
+{
+}
+
+/**
+ * logind_object_manager_client_get_proxy_type:
+ * @manager: A #GDBusObjectManagerClient.
+ * @object_path: The object path of the remote object (unused).
+ * @interface_name: (allow-none): Interface name of the remote object or %NULL to get the object proxy #GType.
+ * @user_data: User data (unused).
+ *
+ * A #GDBusProxyTypeFunc that maps @interface_name to the generated #GDBusObjectProxy<!-- -->- and #GDBusProxy<!-- -->-derived types.
+ *
+ * Returns: A #GDBusProxy<!-- -->-derived #GType if @interface_name is not %NULL, otherwise the #GType for #logindObjectProxy.
+ */
+GType
+logind_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager G_GNUC_UNUSED, const gchar *object_path G_GNUC_UNUSED, const gchar *interface_name, gpointer user_data G_GNUC_UNUSED)
+{
+  static gsize once_init_value = 0;
+  static GHashTable *lookup_hash;
+  GType ret;
+
+  if (interface_name == NULL)
+    return LOGIND_TYPE_OBJECT_PROXY;
+  if (g_once_init_enter (&once_init_value))
+    {
+      lookup_hash = g_hash_table_new (g_str_hash, g_str_equal);
+      g_hash_table_insert (lookup_hash, (gpointer) "org.freedesktop.login1.Manager", GSIZE_TO_POINTER (LOGIND_TYPE_LOGIN1_MANAGER_PROXY));
+      g_once_init_leave (&once_init_value, 1);
+    }
+  ret = (GType) GPOINTER_TO_SIZE (g_hash_table_lookup (lookup_hash, interface_name));
+  if (ret == (GType) 0)
+    ret = G_TYPE_DBUS_PROXY;
+  return ret;
+}
+
+/**
+ * logind_object_manager_client_new:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously creates #GDBusObjectManagerClient using logind_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new() for more details.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call logind_object_manager_client_new_finish() to get the result of the operation.
+ *
+ * See logind_object_manager_client_new_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+logind_object_manager_client_new (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data)
+{
+  g_async_initable_new_async (LOGIND_TYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", logind_object_manager_client_get_proxy_type, NULL);
+}
+
+/**
+ * logind_object_manager_client_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_object_manager_client_new().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with logind_object_manager_client_new().
+ *
+ * Returns: (transfer full) (type logindObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+logind_object_manager_client_new_finish (
+    GAsyncResult        *res,
+    GError             **error)
+{
+  GObject *ret;
+  GObject *source_object;
+  source_object = g_async_result_get_source_object (res);
+  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+  g_object_unref (source_object);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+/**
+ * logind_object_manager_client_new_sync:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Synchronously creates #GDBusObjectManagerClient using logind_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new_sync() for more details.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See logind_object_manager_client_new() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type logindObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+logind_object_manager_client_new_sync (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error)
+{
+  GInitable *ret;
+  ret = g_initable_new (LOGIND_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", logind_object_manager_client_get_proxy_type, NULL);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+
+/**
+ * logind_object_manager_client_new_for_bus:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Like logind_object_manager_client_new() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call logind_object_manager_client_new_for_bus_finish() to get the result of the operation.
+ *
+ * See logind_object_manager_client_new_for_bus_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+logind_object_manager_client_new_for_bus (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data)
+{
+  g_async_initable_new_async (LOGIND_TYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", logind_object_manager_client_get_proxy_type, NULL);
+}
+
+/**
+ * logind_object_manager_client_new_for_bus_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to logind_object_manager_client_new_for_bus().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with logind_object_manager_client_new_for_bus().
+ *
+ * Returns: (transfer full) (type logindObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+logind_object_manager_client_new_for_bus_finish (
+    GAsyncResult        *res,
+    GError             **error)
+{
+  GObject *ret;
+  GObject *source_object;
+  source_object = g_async_result_get_source_object (res);
+  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+  g_object_unref (source_object);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+/**
+ * logind_object_manager_client_new_for_bus_sync:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Like logind_object_manager_client_new_sync() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See logind_object_manager_client_new_for_bus() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type logindObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+logind_object_manager_client_new_for_bus_sync (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error)
+{
+  GInitable *ret;
+  ret = g_initable_new (LOGIND_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", logind_object_manager_client_get_proxy_type, NULL);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+
diff --git a/src/interfaces/logind/logind-gen.h b/src/interfaces/logind/logind-gen.h
index 3abf886..fb92f13 100644
--- a/src/interfaces/logind/logind-gen.h
+++ b/src/interfaces/logind/logind-gen.h
@@ -15,61 +15,61 @@ G_BEGIN_DECLS
 /* ------------------------------------------------------------------------ */
 /* Declarations for org.freedesktop.login1.Manager */
 
-#define TYPE_LOGIN1_MANAGER (login1_manager_get_type ())
-#define LOGIN1_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_LOGIN1_MANAGER, Login1Manager))
-#define IS_LOGIN1_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_LOGIN1_MANAGER))
-#define LOGIN1_MANAGER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TYPE_LOGIN1_MANAGER, Login1ManagerIface))
+#define LOGIND_TYPE_LOGIN1_MANAGER (logind_login1_manager_get_type ())
+#define LOGIND_LOGIN1_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOGIND_TYPE_LOGIN1_MANAGER, logindLogin1Manager))
+#define LOGIND_IS_LOGIN1_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOGIND_TYPE_LOGIN1_MANAGER))
+#define LOGIND_LOGIN1_MANAGER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), LOGIND_TYPE_LOGIN1_MANAGER, logindLogin1ManagerIface))
 
-struct _Login1Manager;
-typedef struct _Login1Manager Login1Manager;
-typedef struct _Login1ManagerIface Login1ManagerIface;
+struct _logindLogin1Manager;
+typedef struct _logindLogin1Manager logindLogin1Manager;
+typedef struct _logindLogin1ManagerIface logindLogin1ManagerIface;
 
-struct _Login1ManagerIface
+struct _logindLogin1ManagerIface
 {
   GTypeInterface parent_iface;
 
 
 
   gboolean (*handle_activate_session) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0);
 
   gboolean (*handle_activate_session_on_seat) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
   gboolean (*handle_attach_device) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gboolean arg_unnamed_arg2);
 
   gboolean (*handle_can_hibernate) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_can_hybrid_sleep) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_can_power_off) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_can_reboot) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_can_suspend) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_create_session) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     guint arg_unnamed_arg0,
     guint arg_unnamed_arg1,
@@ -87,47 +87,47 @@ struct _Login1ManagerIface
     GVariant *arg_unnamed_arg13);
 
   gboolean (*handle_flush_devices) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     gboolean arg_unnamed_arg0);
 
   gboolean (*handle_get_seat) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0);
 
   gboolean (*handle_get_session) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0);
 
   gboolean (*handle_get_session_by_pid) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     guint arg_unnamed_arg0);
 
   gboolean (*handle_get_user) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     guint arg_unnamed_arg0);
 
   gboolean (*handle_get_user_by_pid) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     guint arg_unnamed_arg0);
 
   gboolean (*handle_hibernate) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     gboolean arg_unnamed_arg0);
 
   gboolean (*handle_hybrid_sleep) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     gboolean arg_unnamed_arg0);
 
   gboolean (*handle_inhibit) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
@@ -135,224 +135,224 @@ struct _Login1ManagerIface
     const gchar *arg_unnamed_arg3);
 
   gboolean (*handle_kill_session) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gint arg_unnamed_arg2);
 
   gboolean (*handle_kill_user) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     guint arg_unnamed_arg0,
     gint arg_unnamed_arg1);
 
   gboolean (*handle_list_inhibitors) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_list_seats) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_list_sessions) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_list_users) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_lock_session) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0);
 
   gboolean (*handle_lock_sessions) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
   gboolean (*handle_power_off) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     gboolean arg_unnamed_arg0);
 
   gboolean (*handle_reboot) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     gboolean arg_unnamed_arg0);
 
   gboolean (*handle_release_session) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0);
 
   gboolean (*handle_set_user_linger) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     guint arg_unnamed_arg0,
     gboolean arg_unnamed_arg1,
     gboolean arg_unnamed_arg2);
 
   gboolean (*handle_suspend) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     gboolean arg_unnamed_arg0);
 
   gboolean (*handle_terminate_seat) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0);
 
   gboolean (*handle_terminate_session) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0);
 
   gboolean (*handle_terminate_user) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     guint arg_unnamed_arg0);
 
   gboolean (*handle_unlock_session) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *arg_unnamed_arg0);
 
   gboolean (*handle_unlock_sessions) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-  const gchar * (*get_block_inhibited) (Login1Manager *object);
+  const gchar * (*get_block_inhibited) (logindLogin1Manager *object);
 
-  const gchar * (*get_delay_inhibited) (Login1Manager *object);
+  const gchar * (*get_delay_inhibited) (logindLogin1Manager *object);
 
-  const gchar * (*get_handle_hibernate_key) (Login1Manager *object);
+  const gchar * (*get_handle_hibernate_key) (logindLogin1Manager *object);
 
-  const gchar * (*get_handle_lid_switch) (Login1Manager *object);
+  const gchar * (*get_handle_lid_switch) (logindLogin1Manager *object);
 
-  const gchar * (*get_handle_power_key) (Login1Manager *object);
+  const gchar * (*get_handle_power_key) (logindLogin1Manager *object);
 
-  const gchar * (*get_handle_suspend_key) (Login1Manager *object);
+  const gchar * (*get_handle_suspend_key) (logindLogin1Manager *object);
 
-  const gchar * (*get_idle_action) (Login1Manager *object);
+  const gchar * (*get_idle_action) (logindLogin1Manager *object);
 
-  guint64  (*get_idle_action_usec) (Login1Manager *object);
+  guint64  (*get_idle_action_usec) (logindLogin1Manager *object);
 
-  gboolean  (*get_idle_hint) (Login1Manager *object);
+  gboolean  (*get_idle_hint) (logindLogin1Manager *object);
 
-  guint64  (*get_idle_since_hint) (Login1Manager *object);
+  guint64  (*get_idle_since_hint) (logindLogin1Manager *object);
 
-  guint64  (*get_idle_since_hint_monotonic) (Login1Manager *object);
+  guint64  (*get_idle_since_hint_monotonic) (logindLogin1Manager *object);
 
-  guint64  (*get_inhibit_delay_max_usec) (Login1Manager *object);
+  guint64  (*get_inhibit_delay_max_usec) (logindLogin1Manager *object);
 
-  const gchar *const * (*get_kill_exclude_users) (Login1Manager *object);
+  const gchar *const * (*get_kill_exclude_users) (logindLogin1Manager *object);
 
-  const gchar *const * (*get_kill_only_users) (Login1Manager *object);
+  const gchar *const * (*get_kill_only_users) (logindLogin1Manager *object);
 
-  gboolean  (*get_kill_user_processes) (Login1Manager *object);
+  gboolean  (*get_kill_user_processes) (logindLogin1Manager *object);
 
-  guint  (*get_nauto_vts) (Login1Manager *object);
+  guint  (*get_nauto_vts) (logindLogin1Manager *object);
 
-  gboolean  (*get_preparing_for_shutdown) (Login1Manager *object);
+  gboolean  (*get_preparing_for_shutdown) (logindLogin1Manager *object);
 
-  gboolean  (*get_preparing_for_sleep) (Login1Manager *object);
+  gboolean  (*get_preparing_for_sleep) (logindLogin1Manager *object);
 
   void (*prepare_for_shutdown) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     gboolean arg_unnamed_arg0);
 
   void (*prepare_for_sleep) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     gboolean arg_unnamed_arg0);
 
   void (*seat_new) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
   void (*seat_removed) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
   void (*session_new) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
   void (*session_removed) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
   void (*user_new) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     guint arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
   void (*user_removed) (
-    Login1Manager *object,
+    logindLogin1Manager *object,
     guint arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
 };
 
-GType login1_manager_get_type (void) G_GNUC_CONST;
+GType logind_login1_manager_get_type (void) G_GNUC_CONST;
 
-GDBusInterfaceInfo *login1_manager_interface_info (void);
-guint login1_manager_override_properties (GObjectClass *klass, guint property_id_begin);
+GDBusInterfaceInfo *logind_login1_manager_interface_info (void);
+guint logind_login1_manager_override_properties (GObjectClass *klass, guint property_id_begin);
 
 
 /* D-Bus method call completion functions: */
-void login1_manager_complete_get_session (
-    Login1Manager *object,
+void logind_login1_manager_complete_get_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1);
 
-void login1_manager_complete_get_session_by_pid (
-    Login1Manager *object,
+void logind_login1_manager_complete_get_session_by_pid (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1);
 
-void login1_manager_complete_get_user (
-    Login1Manager *object,
+void logind_login1_manager_complete_get_user (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1);
 
-void login1_manager_complete_get_user_by_pid (
-    Login1Manager *object,
+void logind_login1_manager_complete_get_user_by_pid (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1);
 
-void login1_manager_complete_get_seat (
-    Login1Manager *object,
+void logind_login1_manager_complete_get_seat (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg1);
 
-void login1_manager_complete_list_sessions (
-    Login1Manager *object,
+void logind_login1_manager_complete_list_sessions (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg0);
 
-void login1_manager_complete_list_users (
-    Login1Manager *object,
+void logind_login1_manager_complete_list_users (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg0);
 
-void login1_manager_complete_list_seats (
-    Login1Manager *object,
+void logind_login1_manager_complete_list_seats (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg0);
 
-void login1_manager_complete_list_inhibitors (
-    Login1Manager *object,
+void logind_login1_manager_complete_list_inhibitors (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg0);
 
-void login1_manager_complete_create_session (
-    Login1Manager *object,
+void logind_login1_manager_complete_create_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg14,
     const gchar *unnamed_arg15,
@@ -363,334 +363,334 @@ void login1_manager_complete_create_session (
     guint unnamed_arg20,
     gboolean unnamed_arg21);
 
-void login1_manager_complete_release_session (
-    Login1Manager *object,
+void logind_login1_manager_complete_release_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_activate_session (
-    Login1Manager *object,
+void logind_login1_manager_complete_activate_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_activate_session_on_seat (
-    Login1Manager *object,
+void logind_login1_manager_complete_activate_session_on_seat (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_lock_session (
-    Login1Manager *object,
+void logind_login1_manager_complete_lock_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_unlock_session (
-    Login1Manager *object,
+void logind_login1_manager_complete_unlock_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_lock_sessions (
-    Login1Manager *object,
+void logind_login1_manager_complete_lock_sessions (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_unlock_sessions (
-    Login1Manager *object,
+void logind_login1_manager_complete_unlock_sessions (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_kill_session (
-    Login1Manager *object,
+void logind_login1_manager_complete_kill_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_kill_user (
-    Login1Manager *object,
+void logind_login1_manager_complete_kill_user (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_terminate_session (
-    Login1Manager *object,
+void logind_login1_manager_complete_terminate_session (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_terminate_user (
-    Login1Manager *object,
+void logind_login1_manager_complete_terminate_user (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_terminate_seat (
-    Login1Manager *object,
+void logind_login1_manager_complete_terminate_seat (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_set_user_linger (
-    Login1Manager *object,
+void logind_login1_manager_complete_set_user_linger (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_attach_device (
-    Login1Manager *object,
+void logind_login1_manager_complete_attach_device (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_flush_devices (
-    Login1Manager *object,
+void logind_login1_manager_complete_flush_devices (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_power_off (
-    Login1Manager *object,
+void logind_login1_manager_complete_power_off (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_reboot (
-    Login1Manager *object,
+void logind_login1_manager_complete_reboot (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_suspend (
-    Login1Manager *object,
+void logind_login1_manager_complete_suspend (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_hibernate (
-    Login1Manager *object,
+void logind_login1_manager_complete_hibernate (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_hybrid_sleep (
-    Login1Manager *object,
+void logind_login1_manager_complete_hybrid_sleep (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation);
 
-void login1_manager_complete_can_power_off (
-    Login1Manager *object,
+void logind_login1_manager_complete_can_power_off (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0);
 
-void login1_manager_complete_can_reboot (
-    Login1Manager *object,
+void logind_login1_manager_complete_can_reboot (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0);
 
-void login1_manager_complete_can_suspend (
-    Login1Manager *object,
+void logind_login1_manager_complete_can_suspend (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0);
 
-void login1_manager_complete_can_hibernate (
-    Login1Manager *object,
+void logind_login1_manager_complete_can_hibernate (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0);
 
-void login1_manager_complete_can_hybrid_sleep (
-    Login1Manager *object,
+void logind_login1_manager_complete_can_hybrid_sleep (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     const gchar *unnamed_arg0);
 
-void login1_manager_complete_inhibit (
-    Login1Manager *object,
+void logind_login1_manager_complete_inhibit (
+    logindLogin1Manager *object,
     GDBusMethodInvocation *invocation,
     GVariant *unnamed_arg4);
 
 
 
 /* D-Bus signal emissions functions: */
-void login1_manager_emit_session_new (
-    Login1Manager *object,
+void logind_login1_manager_emit_session_new (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
-void login1_manager_emit_session_removed (
-    Login1Manager *object,
+void logind_login1_manager_emit_session_removed (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
-void login1_manager_emit_user_new (
-    Login1Manager *object,
+void logind_login1_manager_emit_user_new (
+    logindLogin1Manager *object,
     guint arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
-void login1_manager_emit_user_removed (
-    Login1Manager *object,
+void logind_login1_manager_emit_user_removed (
+    logindLogin1Manager *object,
     guint arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
-void login1_manager_emit_seat_new (
-    Login1Manager *object,
+void logind_login1_manager_emit_seat_new (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
-void login1_manager_emit_seat_removed (
-    Login1Manager *object,
+void logind_login1_manager_emit_seat_removed (
+    logindLogin1Manager *object,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1);
 
-void login1_manager_emit_prepare_for_shutdown (
-    Login1Manager *object,
+void logind_login1_manager_emit_prepare_for_shutdown (
+    logindLogin1Manager *object,
     gboolean arg_unnamed_arg0);
 
-void login1_manager_emit_prepare_for_sleep (
-    Login1Manager *object,
+void logind_login1_manager_emit_prepare_for_sleep (
+    logindLogin1Manager *object,
     gboolean arg_unnamed_arg0);
 
 
 
 /* D-Bus method calls: */
-void login1_manager_call_get_session (
-    Login1Manager *proxy,
+void logind_login1_manager_call_get_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_get_session_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_session_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_get_session_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_get_session_by_pid (
-    Login1Manager *proxy,
+void logind_login1_manager_call_get_session_by_pid (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_get_session_by_pid_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_session_by_pid_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_get_session_by_pid_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_session_by_pid_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_get_user (
-    Login1Manager *proxy,
+void logind_login1_manager_call_get_user (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_get_user_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_user_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_get_user_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_user_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_get_user_by_pid (
-    Login1Manager *proxy,
+void logind_login1_manager_call_get_user_by_pid (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_get_user_by_pid_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_user_by_pid_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_get_user_by_pid_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_user_by_pid_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_get_seat (
-    Login1Manager *proxy,
+void logind_login1_manager_call_get_seat (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_get_seat_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_seat_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg1,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_get_seat_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_get_seat_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     gchar **out_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_list_sessions (
-    Login1Manager *proxy,
+void logind_login1_manager_call_list_sessions (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_list_sessions_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_list_sessions_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_list_sessions_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_list_sessions_sync (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_list_users (
-    Login1Manager *proxy,
+void logind_login1_manager_call_list_users (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_list_users_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_list_users_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_list_users_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_list_users_sync (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_list_seats (
-    Login1Manager *proxy,
+void logind_login1_manager_call_list_seats (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_list_seats_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_list_seats_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_list_seats_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_list_seats_sync (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_list_inhibitors (
-    Login1Manager *proxy,
+void logind_login1_manager_call_list_inhibitors (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_list_inhibitors_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_list_inhibitors_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_list_inhibitors_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_list_inhibitors_sync (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_create_session (
-    Login1Manager *proxy,
+void logind_login1_manager_call_create_session (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     guint arg_unnamed_arg1,
     const gchar *arg_unnamed_arg2,
@@ -709,8 +709,8 @@ void login1_manager_call_create_session (
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_create_session_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_create_session_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg14,
     gchar **out_unnamed_arg15,
     gchar **out_unnamed_arg16,
@@ -722,8 +722,8 @@ gboolean login1_manager_call_create_session_finish (
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_create_session_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_create_session_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     guint arg_unnamed_arg1,
     const gchar *arg_unnamed_arg2,
@@ -749,132 +749,132 @@ gboolean login1_manager_call_create_session_sync (
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_release_session (
-    Login1Manager *proxy,
+void logind_login1_manager_call_release_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_release_session_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_release_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_release_session_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_release_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_activate_session (
-    Login1Manager *proxy,
+void logind_login1_manager_call_activate_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_activate_session_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_activate_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_activate_session_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_activate_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_activate_session_on_seat (
-    Login1Manager *proxy,
+void logind_login1_manager_call_activate_session_on_seat (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_activate_session_on_seat_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_activate_session_on_seat_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_activate_session_on_seat_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_activate_session_on_seat_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_lock_session (
-    Login1Manager *proxy,
+void logind_login1_manager_call_lock_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_lock_session_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_lock_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_lock_session_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_lock_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_unlock_session (
-    Login1Manager *proxy,
+void logind_login1_manager_call_unlock_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_unlock_session_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_unlock_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_unlock_session_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_unlock_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_lock_sessions (
-    Login1Manager *proxy,
+void logind_login1_manager_call_lock_sessions (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_lock_sessions_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_lock_sessions_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_lock_sessions_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_lock_sessions_sync (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_unlock_sessions (
-    Login1Manager *proxy,
+void logind_login1_manager_call_unlock_sessions (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_unlock_sessions_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_unlock_sessions_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_unlock_sessions_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_unlock_sessions_sync (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_kill_session (
-    Login1Manager *proxy,
+void logind_login1_manager_call_kill_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gint arg_unnamed_arg2,
@@ -882,95 +882,95 @@ void login1_manager_call_kill_session (
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_kill_session_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_kill_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_kill_session_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_kill_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gint arg_unnamed_arg2,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_kill_user (
-    Login1Manager *proxy,
+void logind_login1_manager_call_kill_user (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gint arg_unnamed_arg1,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_kill_user_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_kill_user_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_kill_user_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_kill_user_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gint arg_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_terminate_session (
-    Login1Manager *proxy,
+void logind_login1_manager_call_terminate_session (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_terminate_session_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_terminate_session_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_terminate_session_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_terminate_session_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_terminate_user (
-    Login1Manager *proxy,
+void logind_login1_manager_call_terminate_user (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_terminate_user_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_terminate_user_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_terminate_user_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_terminate_user_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_terminate_seat (
-    Login1Manager *proxy,
+void logind_login1_manager_call_terminate_seat (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_terminate_seat_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_terminate_seat_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_terminate_seat_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_terminate_seat_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_set_user_linger (
-    Login1Manager *proxy,
+void logind_login1_manager_call_set_user_linger (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gboolean arg_unnamed_arg1,
     gboolean arg_unnamed_arg2,
@@ -978,21 +978,21 @@ void login1_manager_call_set_user_linger (
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_set_user_linger_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_set_user_linger_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_set_user_linger_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_set_user_linger_sync (
+    logindLogin1Manager *proxy,
     guint arg_unnamed_arg0,
     gboolean arg_unnamed_arg1,
     gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_attach_device (
-    Login1Manager *proxy,
+void logind_login1_manager_call_attach_device (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gboolean arg_unnamed_arg2,
@@ -1000,219 +1000,219 @@ void login1_manager_call_attach_device (
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_attach_device_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_attach_device_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_attach_device_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_attach_device_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_flush_devices (
-    Login1Manager *proxy,
+void logind_login1_manager_call_flush_devices (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_flush_devices_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_flush_devices_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_flush_devices_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_flush_devices_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_power_off (
-    Login1Manager *proxy,
+void logind_login1_manager_call_power_off (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_power_off_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_power_off_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_power_off_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_power_off_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_reboot (
-    Login1Manager *proxy,
+void logind_login1_manager_call_reboot (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_reboot_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_reboot_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_reboot_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_reboot_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_suspend (
-    Login1Manager *proxy,
+void logind_login1_manager_call_suspend (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_suspend_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_suspend_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_suspend_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_suspend_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_hibernate (
-    Login1Manager *proxy,
+void logind_login1_manager_call_hibernate (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_hibernate_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_hibernate_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_hibernate_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_hibernate_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_hybrid_sleep (
-    Login1Manager *proxy,
+void logind_login1_manager_call_hybrid_sleep (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_hybrid_sleep_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_hybrid_sleep_finish (
+    logindLogin1Manager *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_hybrid_sleep_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_hybrid_sleep_sync (
+    logindLogin1Manager *proxy,
     gboolean arg_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_can_power_off (
-    Login1Manager *proxy,
+void logind_login1_manager_call_can_power_off (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_can_power_off_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_power_off_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_can_power_off_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_power_off_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_can_reboot (
-    Login1Manager *proxy,
+void logind_login1_manager_call_can_reboot (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_can_reboot_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_reboot_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_can_reboot_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_reboot_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_can_suspend (
-    Login1Manager *proxy,
+void logind_login1_manager_call_can_suspend (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_can_suspend_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_suspend_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_can_suspend_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_suspend_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_can_hibernate (
-    Login1Manager *proxy,
+void logind_login1_manager_call_can_hibernate (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_can_hibernate_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_hibernate_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_can_hibernate_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_hibernate_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_can_hybrid_sleep (
-    Login1Manager *proxy,
+void logind_login1_manager_call_can_hybrid_sleep (
+    logindLogin1Manager *proxy,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_can_hybrid_sleep_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_hybrid_sleep_finish (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_can_hybrid_sleep_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_can_hybrid_sleep_sync (
+    logindLogin1Manager *proxy,
     gchar **out_unnamed_arg0,
     GCancellable *cancellable,
     GError **error);
 
-void login1_manager_call_inhibit (
-    Login1Manager *proxy,
+void logind_login1_manager_call_inhibit (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     const gchar *arg_unnamed_arg2,
@@ -1221,14 +1221,14 @@ void login1_manager_call_inhibit (
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean login1_manager_call_inhibit_finish (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_inhibit_finish (
+    logindLogin1Manager *proxy,
     GVariant **out_unnamed_arg4,
     GAsyncResult *res,
     GError **error);
 
-gboolean login1_manager_call_inhibit_sync (
-    Login1Manager *proxy,
+gboolean logind_login1_manager_call_inhibit_sync (
+    logindLogin1Manager *proxy,
     const gchar *arg_unnamed_arg0,
     const gchar *arg_unnamed_arg1,
     const gchar *arg_unnamed_arg2,
@@ -1240,98 +1240,98 @@ gboolean login1_manager_call_inhibit_sync (
 
 
 /* D-Bus property accessors: */
-guint login1_manager_get_nauto_vts (Login1Manager *object);
-void login1_manager_set_nauto_vts (Login1Manager *object, guint value);
+guint logind_login1_manager_get_nauto_vts (logindLogin1Manager *object);
+void logind_login1_manager_set_nauto_vts (logindLogin1Manager *object, guint value);
 
-const gchar *const *login1_manager_get_kill_only_users (Login1Manager *object);
-gchar **login1_manager_dup_kill_only_users (Login1Manager *object);
-void login1_manager_set_kill_only_users (Login1Manager *object, const gchar *const *value);
+const gchar *const *logind_login1_manager_get_kill_only_users (logindLogin1Manager *object);
+gchar **logind_login1_manager_dup_kill_only_users (logindLogin1Manager *object);
+void logind_login1_manager_set_kill_only_users (logindLogin1Manager *object, const gchar *const *value);
 
-const gchar *const *login1_manager_get_kill_exclude_users (Login1Manager *object);
-gchar **login1_manager_dup_kill_exclude_users (Login1Manager *object);
-void login1_manager_set_kill_exclude_users (Login1Manager *object, const gchar *const *value);
+const gchar *const *logind_login1_manager_get_kill_exclude_users (logindLogin1Manager *object);
+gchar **logind_login1_manager_dup_kill_exclude_users (logindLogin1Manager *object);
+void logind_login1_manager_set_kill_exclude_users (logindLogin1Manager *object, const gchar *const *value);
 
-gboolean login1_manager_get_kill_user_processes (Login1Manager *object);
-void login1_manager_set_kill_user_processes (Login1Manager *object, gboolean value);
+gboolean logind_login1_manager_get_kill_user_processes (logindLogin1Manager *object);
+void logind_login1_manager_set_kill_user_processes (logindLogin1Manager *object, gboolean value);
 
-gboolean login1_manager_get_idle_hint (Login1Manager *object);
-void login1_manager_set_idle_hint (Login1Manager *object, gboolean value);
+gboolean logind_login1_manager_get_idle_hint (logindLogin1Manager *object);
+void logind_login1_manager_set_idle_hint (logindLogin1Manager *object, gboolean value);
 
-guint64 login1_manager_get_idle_since_hint (Login1Manager *object);
-void login1_manager_set_idle_since_hint (Login1Manager *object, guint64 value);
+guint64 logind_login1_manager_get_idle_since_hint (logindLogin1Manager *object);
+void logind_login1_manager_set_idle_since_hint (logindLogin1Manager *object, guint64 value);
 
-guint64 login1_manager_get_idle_since_hint_monotonic (Login1Manager *object);
-void login1_manager_set_idle_since_hint_monotonic (Login1Manager *object, guint64 value);
+guint64 logind_login1_manager_get_idle_since_hint_monotonic (logindLogin1Manager *object);
+void logind_login1_manager_set_idle_since_hint_monotonic (logindLogin1Manager *object, guint64 value);
 
-const gchar *login1_manager_get_block_inhibited (Login1Manager *object);
-gchar *login1_manager_dup_block_inhibited (Login1Manager *object);
-void login1_manager_set_block_inhibited (Login1Manager *object, const gchar *value);
+const gchar *logind_login1_manager_get_block_inhibited (logindLogin1Manager *object);
+gchar *logind_login1_manager_dup_block_inhibited (logindLogin1Manager *object);
+void logind_login1_manager_set_block_inhibited (logindLogin1Manager *object, const gchar *value);
 
-const gchar *login1_manager_get_delay_inhibited (Login1Manager *object);
-gchar *login1_manager_dup_delay_inhibited (Login1Manager *object);
-void login1_manager_set_delay_inhibited (Login1Manager *object, const gchar *value);
+const gchar *logind_login1_manager_get_delay_inhibited (logindLogin1Manager *object);
+gchar *logind_login1_manager_dup_delay_inhibited (logindLogin1Manager *object);
+void logind_login1_manager_set_delay_inhibited (logindLogin1Manager *object, const gchar *value);
 
-guint64 login1_manager_get_inhibit_delay_max_usec (Login1Manager *object);
-void login1_manager_set_inhibit_delay_max_usec (Login1Manager *object, guint64 value);
+guint64 logind_login1_manager_get_inhibit_delay_max_usec (logindLogin1Manager *object);
+void logind_login1_manager_set_inhibit_delay_max_usec (logindLogin1Manager *object, guint64 value);
 
-const gchar *login1_manager_get_handle_power_key (Login1Manager *object);
-gchar *login1_manager_dup_handle_power_key (Login1Manager *object);
-void login1_manager_set_handle_power_key (Login1Manager *object, const gchar *value);
+const gchar *logind_login1_manager_get_handle_power_key (logindLogin1Manager *object);
+gchar *logind_login1_manager_dup_handle_power_key (logindLogin1Manager *object);
+void logind_login1_manager_set_handle_power_key (logindLogin1Manager *object, const gchar *value);
 
-const gchar *login1_manager_get_handle_suspend_key (Login1Manager *object);
-gchar *login1_manager_dup_handle_suspend_key (Login1Manager *object);
-void login1_manager_set_handle_suspend_key (Login1Manager *object, const gchar *value);
+const gchar *logind_login1_manager_get_handle_suspend_key (logindLogin1Manager *object);
+gchar *logind_login1_manager_dup_handle_suspend_key (logindLogin1Manager *object);
+void logind_login1_manager_set_handle_suspend_key (logindLogin1Manager *object, const gchar *value);
 
-const gchar *login1_manager_get_handle_hibernate_key (Login1Manager *object);
-gchar *login1_manager_dup_handle_hibernate_key (Login1Manager *object);
-void login1_manager_set_handle_hibernate_key (Login1Manager *object, const gchar *value);
+const gchar *logind_login1_manager_get_handle_hibernate_key (logindLogin1Manager *object);
+gchar *logind_login1_manager_dup_handle_hibernate_key (logindLogin1Manager *object);
+void logind_login1_manager_set_handle_hibernate_key (logindLogin1Manager *object, const gchar *value);
 
-const gchar *login1_manager_get_handle_lid_switch (Login1Manager *object);
-gchar *login1_manager_dup_handle_lid_switch (Login1Manager *object);
-void login1_manager_set_handle_lid_switch (Login1Manager *object, const gchar *value);
+const gchar *logind_login1_manager_get_handle_lid_switch (logindLogin1Manager *object);
+gchar *logind_login1_manager_dup_handle_lid_switch (logindLogin1Manager *object);
+void logind_login1_manager_set_handle_lid_switch (logindLogin1Manager *object, const gchar *value);
 
-const gchar *login1_manager_get_idle_action (Login1Manager *object);
-gchar *login1_manager_dup_idle_action (Login1Manager *object);
-void login1_manager_set_idle_action (Login1Manager *object, const gchar *value);
+const gchar *logind_login1_manager_get_idle_action (logindLogin1Manager *object);
+gchar *logind_login1_manager_dup_idle_action (logindLogin1Manager *object);
+void logind_login1_manager_set_idle_action (logindLogin1Manager *object, const gchar *value);
 
-guint64 login1_manager_get_idle_action_usec (Login1Manager *object);
-void login1_manager_set_idle_action_usec (Login1Manager *object, guint64 value);
+guint64 logind_login1_manager_get_idle_action_usec (logindLogin1Manager *object);
+void logind_login1_manager_set_idle_action_usec (logindLogin1Manager *object, guint64 value);
 
-gboolean login1_manager_get_preparing_for_shutdown (Login1Manager *object);
-void login1_manager_set_preparing_for_shutdown (Login1Manager *object, gboolean value);
+gboolean logind_login1_manager_get_preparing_for_shutdown (logindLogin1Manager *object);
+void logind_login1_manager_set_preparing_for_shutdown (logindLogin1Manager *object, gboolean value);
 
-gboolean login1_manager_get_preparing_for_sleep (Login1Manager *object);
-void login1_manager_set_preparing_for_sleep (Login1Manager *object, gboolean value);
+gboolean logind_login1_manager_get_preparing_for_sleep (logindLogin1Manager *object);
+void logind_login1_manager_set_preparing_for_sleep (logindLogin1Manager *object, gboolean value);
 
 
 /* ---- */
 
-#define TYPE_LOGIN1_MANAGER_PROXY (login1_manager_proxy_get_type ())
-#define LOGIN1_MANAGER_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_LOGIN1_MANAGER_PROXY, Login1ManagerProxy))
-#define LOGIN1_MANAGER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_LOGIN1_MANAGER_PROXY, Login1ManagerProxyClass))
-#define LOGIN1_MANAGER_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_LOGIN1_MANAGER_PROXY, Login1ManagerProxyClass))
-#define IS_LOGIN1_MANAGER_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_LOGIN1_MANAGER_PROXY))
-#define IS_LOGIN1_MANAGER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_LOGIN1_MANAGER_PROXY))
+#define LOGIND_TYPE_LOGIN1_MANAGER_PROXY (logind_login1_manager_proxy_get_type ())
+#define LOGIND_LOGIN1_MANAGER_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOGIND_TYPE_LOGIN1_MANAGER_PROXY, logindLogin1ManagerProxy))
+#define LOGIND_LOGIN1_MANAGER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOGIND_TYPE_LOGIN1_MANAGER_PROXY, logindLogin1ManagerProxyClass))
+#define LOGIND_LOGIN1_MANAGER_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOGIND_TYPE_LOGIN1_MANAGER_PROXY, logindLogin1ManagerProxyClass))
+#define LOGIND_IS_LOGIN1_MANAGER_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOGIND_TYPE_LOGIN1_MANAGER_PROXY))
+#define LOGIND_IS_LOGIN1_MANAGER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOGIND_TYPE_LOGIN1_MANAGER_PROXY))
 
-typedef struct _Login1ManagerProxy Login1ManagerProxy;
-typedef struct _Login1ManagerProxyClass Login1ManagerProxyClass;
-typedef struct _Login1ManagerProxyPrivate Login1ManagerProxyPrivate;
+typedef struct _logindLogin1ManagerProxy logindLogin1ManagerProxy;
+typedef struct _logindLogin1ManagerProxyClass logindLogin1ManagerProxyClass;
+typedef struct _logindLogin1ManagerProxyPrivate logindLogin1ManagerProxyPrivate;
 
-struct _Login1ManagerProxy
+struct _logindLogin1ManagerProxy
 {
   /*< private >*/
   GDBusProxy parent_instance;
-  Login1ManagerProxyPrivate *priv;
+  logindLogin1ManagerProxyPrivate *priv;
 };
 
-struct _Login1ManagerProxyClass
+struct _logindLogin1ManagerProxyClass
 {
   GDBusProxyClass parent_class;
 };
 
-GType login1_manager_proxy_get_type (void) G_GNUC_CONST;
+GType logind_login1_manager_proxy_get_type (void) G_GNUC_CONST;
 
-void login1_manager_proxy_new (
+void logind_login1_manager_proxy_new (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1339,10 +1339,10 @@ void login1_manager_proxy_new (
     GCancellable        *cancellable,
     GAsyncReadyCallback  callback,
     gpointer             user_data);
-Login1Manager *login1_manager_proxy_new_finish (
+logindLogin1Manager *logind_login1_manager_proxy_new_finish (
     GAsyncResult        *res,
     GError             **error);
-Login1Manager *login1_manager_proxy_new_sync (
+logindLogin1Manager *logind_login1_manager_proxy_new_sync (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1350,7 +1350,7 @@ Login1Manager *login1_manager_proxy_new_sync (
     GCancellable        *cancellable,
     GError             **error);
 
-void login1_manager_proxy_new_for_bus (
+void logind_login1_manager_proxy_new_for_bus (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1358,10 +1358,10 @@ void login1_manager_proxy_new_for_bus (
     GCancellable        *cancellable,
     GAsyncReadyCallback  callback,
     gpointer             user_data);
-Login1Manager *login1_manager_proxy_new_for_bus_finish (
+logindLogin1Manager *logind_login1_manager_proxy_new_for_bus_finish (
     GAsyncResult        *res,
     GError             **error);
-Login1Manager *login1_manager_proxy_new_for_bus_sync (
+logindLogin1Manager *logind_login1_manager_proxy_new_for_bus_sync (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1372,32 +1372,174 @@ Login1Manager *login1_manager_proxy_new_for_bus_sync (
 
 /* ---- */
 
-#define TYPE_LOGIN1_MANAGER_SKELETON (login1_manager_skeleton_get_type ())
-#define LOGIN1_MANAGER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_LOGIN1_MANAGER_SKELETON, Login1ManagerSkeleton))
-#define LOGIN1_MANAGER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_LOGIN1_MANAGER_SKELETON, Login1ManagerSkeletonClass))
-#define LOGIN1_MANAGER_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_LOGIN1_MANAGER_SKELETON, Login1ManagerSkeletonClass))
-#define IS_LOGIN1_MANAGER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_LOGIN1_MANAGER_SKELETON))
-#define IS_LOGIN1_MANAGER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_LOGIN1_MANAGER_SKELETON))
+#define LOGIND_TYPE_LOGIN1_MANAGER_SKELETON (logind_login1_manager_skeleton_get_type ())
+#define LOGIND_LOGIN1_MANAGER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOGIND_TYPE_LOGIN1_MANAGER_SKELETON, logindLogin1ManagerSkeleton))
+#define LOGIND_LOGIN1_MANAGER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOGIND_TYPE_LOGIN1_MANAGER_SKELETON, logindLogin1ManagerSkeletonClass))
+#define LOGIND_LOGIN1_MANAGER_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOGIND_TYPE_LOGIN1_MANAGER_SKELETON, logindLogin1ManagerSkeletonClass))
+#define LOGIND_IS_LOGIN1_MANAGER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOGIND_TYPE_LOGIN1_MANAGER_SKELETON))
+#define LOGIND_IS_LOGIN1_MANAGER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOGIND_TYPE_LOGIN1_MANAGER_SKELETON))
 
-typedef struct _Login1ManagerSkeleton Login1ManagerSkeleton;
-typedef struct _Login1ManagerSkeletonClass Login1ManagerSkeletonClass;
-typedef struct _Login1ManagerSkeletonPrivate Login1ManagerSkeletonPrivate;
+typedef struct _logindLogin1ManagerSkeleton logindLogin1ManagerSkeleton;
+typedef struct _logindLogin1ManagerSkeletonClass logindLogin1ManagerSkeletonClass;
+typedef struct _logindLogin1ManagerSkeletonPrivate logindLogin1ManagerSkeletonPrivate;
 
-struct _Login1ManagerSkeleton
+struct _logindLogin1ManagerSkeleton
 {
   /*< private >*/
   GDBusInterfaceSkeleton parent_instance;
-  Login1ManagerSkeletonPrivate *priv;
+  logindLogin1ManagerSkeletonPrivate *priv;
 };
 
-struct _Login1ManagerSkeletonClass
+struct _logindLogin1ManagerSkeletonClass
 {
   GDBusInterfaceSkeletonClass parent_class;
 };
 
-GType login1_manager_skeleton_get_type (void) G_GNUC_CONST;
+GType logind_login1_manager_skeleton_get_type (void) G_GNUC_CONST;
 
-Login1Manager *login1_manager_skeleton_new (void);
+logindLogin1Manager *logind_login1_manager_skeleton_new (void);
+
+
+/* ---- */
+
+#define LOGIND_TYPE_OBJECT (logind_object_get_type ())
+#define LOGIND_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOGIND_TYPE_OBJECT, logindObject))
+#define LOGIND_IS_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOGIND_TYPE_OBJECT))
+#define LOGIND_OBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), LOGIND_TYPE_OBJECT, logindObject))
+
+struct _logindObject;
+typedef struct _logindObject logindObject;
+typedef struct _logindObjectIface logindObjectIface;
+
+struct _logindObjectIface
+{
+  GTypeInterface parent_iface;
+};
+
+GType logind_object_get_type (void) G_GNUC_CONST;
+
+logindLogin1Manager *logind_object_get_login1_manager (logindObject *object);
+logindLogin1Manager *logind_object_peek_login1_manager (logindObject *object);
+
+#define LOGIND_TYPE_OBJECT_PROXY (logind_object_proxy_get_type ())
+#define LOGIND_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOGIND_TYPE_OBJECT_PROXY, logindObjectProxy))
+#define LOGIND_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOGIND_TYPE_OBJECT_PROXY, logindObjectProxyClass))
+#define LOGIND_OBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOGIND_TYPE_OBJECT_PROXY, logindObjectProxyClass))
+#define LOGIND_IS_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOGIND_TYPE_OBJECT_PROXY))
+#define LOGIND_IS_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOGIND_TYPE_OBJECT_PROXY))
+
+typedef struct _logindObjectProxy logindObjectProxy;
+typedef struct _logindObjectProxyClass logindObjectProxyClass;
+typedef struct _logindObjectProxyPrivate logindObjectProxyPrivate;
+
+struct _logindObjectProxy
+{
+  /*< private >*/
+  GDBusObjectProxy parent_instance;
+  logindObjectProxyPrivate *priv;
+};
+
+struct _logindObjectProxyClass
+{
+  GDBusObjectProxyClass parent_class;
+};
+
+GType logind_object_proxy_get_type (void) G_GNUC_CONST;
+logindObjectProxy *logind_object_proxy_new (GDBusConnection *connection, const gchar *object_path);
+
+#define LOGIND_TYPE_OBJECT_SKELETON (logind_object_skeleton_get_type ())
+#define LOGIND_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOGIND_TYPE_OBJECT_SKELETON, logindObjectSkeleton))
+#define LOGIND_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOGIND_TYPE_OBJECT_SKELETON, logindObjectSkeletonClass))
+#define LOGIND_OBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOGIND_TYPE_OBJECT_SKELETON, logindObjectSkeletonClass))
+#define LOGIND_IS_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOGIND_TYPE_OBJECT_SKELETON))
+#define LOGIND_IS_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOGIND_TYPE_OBJECT_SKELETON))
+
+typedef struct _logindObjectSkeleton logindObjectSkeleton;
+typedef struct _logindObjectSkeletonClass logindObjectSkeletonClass;
+typedef struct _logindObjectSkeletonPrivate logindObjectSkeletonPrivate;
+
+struct _logindObjectSkeleton
+{
+  /*< private >*/
+  GDBusObjectSkeleton parent_instance;
+  logindObjectSkeletonPrivate *priv;
+};
+
+struct _logindObjectSkeletonClass
+{
+  GDBusObjectSkeletonClass parent_class;
+};
+
+GType logind_object_skeleton_get_type (void) G_GNUC_CONST;
+logindObjectSkeleton *logind_object_skeleton_new (const gchar *object_path);
+void logind_object_skeleton_set_login1_manager (logindObjectSkeleton *object, logindLogin1Manager *interface_);
+
+/* ---- */
+
+#define LOGIND_TYPE_OBJECT_MANAGER_CLIENT (logind_object_manager_client_get_type ())
+#define LOGIND_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), LOGIND_TYPE_OBJECT_MANAGER_CLIENT, logindObjectManagerClient))
+#define LOGIND_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), LOGIND_TYPE_OBJECT_MANAGER_CLIENT, logindObjectManagerClientClass))
+#define LOGIND_OBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LOGIND_TYPE_OBJECT_MANAGER_CLIENT, logindObjectManagerClientClass))
+#define LOGIND_IS_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), LOGIND_TYPE_OBJECT_MANAGER_CLIENT))
+#define LOGIND_IS_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), LOGIND_TYPE_OBJECT_MANAGER_CLIENT))
+
+typedef struct _logindObjectManagerClient logindObjectManagerClient;
+typedef struct _logindObjectManagerClientClass logindObjectManagerClientClass;
+typedef struct _logindObjectManagerClientPrivate logindObjectManagerClientPrivate;
+
+struct _logindObjectManagerClient
+{
+  /*< private >*/
+  GDBusObjectManagerClient parent_instance;
+  logindObjectManagerClientPrivate *priv;
+};
+
+struct _logindObjectManagerClientClass
+{
+  GDBusObjectManagerClientClass parent_class;
+};
+
+GType logind_object_manager_client_get_type (void) G_GNUC_CONST;
+
+GType logind_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data);
+
+void logind_object_manager_client_new (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data);
+GDBusObjectManager *logind_object_manager_client_new_finish (
+    GAsyncResult        *res,
+    GError             **error);
+GDBusObjectManager *logind_object_manager_client_new_sync (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error);
+
+void logind_object_manager_client_new_for_bus (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data);
+GDBusObjectManager *logind_object_manager_client_new_for_bus_finish (
+    GAsyncResult        *res,
+    GError             **error);
+GDBusObjectManager *logind_object_manager_client_new_for_bus_sync (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error);
 
 
 G_END_DECLS
diff --git a/src/interfaces/timedated/timedated-gen.c b/src/interfaces/timedated/timedated-gen.c
index 13dd73b..44e8978 100644
--- a/src/interfaces/timedated/timedated-gen.c
+++ b/src/interfaces/timedated/timedated-gen.c
@@ -8,7 +8,7 @@
 #  include "config.h"
 #endif
 
-#include "src/interfaces/timedated/timedated-gen.h"
+#include "timedated-gen.h"
 
 #include <string.h>
 #ifdef G_OS_UNIX
@@ -154,8 +154,8 @@ _g_value_equal (const GValue *a, const GValue *b)
  */
 
 /**
- * SECTION:Timedate1
- * @title: Timedate1
+ * SECTION:timedatedTimedate1
+ * @title: timedatedTimedate1
  * @short_description: Generated C code for the org.freedesktop.timedate1 D-Bus interface
  *
  * This section contains code for working with the <link linkend="gdbus-interface-org-freedesktop-timedate1.top_of_page">org.freedesktop.timedate1</link> D-Bus interface in C.
@@ -163,53 +163,53 @@ _g_value_equal (const GValue *a, const GValue *b)
 
 /* ---- Introspection data for org.freedesktop.timedate1 ---- */
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_time_IN_ARG_usec_utc =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_time_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
-    (gchar *) "usec_utc",
+    (gchar *) "unnamed_arg0",
     (gchar *) "x",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_time_IN_ARG_relative =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_time_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
-    (gchar *) "relative",
+    (gchar *) "unnamed_arg1",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_time_IN_ARG_user_interaction =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_time_IN_ARG_unnamed_arg2 =
 {
   {
     -1,
-    (gchar *) "user_interaction",
+    (gchar *) "unnamed_arg2",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _timedate1_method_info_set_time_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _timedated_timedate1_method_info_set_time_IN_ARG_pointers[] =
 {
-  &_timedate1_method_info_set_time_IN_ARG_usec_utc,
-  &_timedate1_method_info_set_time_IN_ARG_relative,
-  &_timedate1_method_info_set_time_IN_ARG_user_interaction,
+  &_timedated_timedate1_method_info_set_time_IN_ARG_unnamed_arg0,
+  &_timedated_timedate1_method_info_set_time_IN_ARG_unnamed_arg1,
+  &_timedated_timedate1_method_info_set_time_IN_ARG_unnamed_arg2,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _timedate1_method_info_set_time =
+static const _ExtendedGDBusMethodInfo _timedated_timedate1_method_info_set_time =
 {
   {
     -1,
     (gchar *) "SetTime",
-    (GDBusArgInfo **) &_timedate1_method_info_set_time_IN_ARG_pointers,
+    (GDBusArgInfo **) &_timedated_timedate1_method_info_set_time_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -217,41 +217,41 @@ static const _ExtendedGDBusMethodInfo _timedate1_method_info_set_time =
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_timezone_IN_ARG_timezone =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_timezone_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
-    (gchar *) "timezone",
+    (gchar *) "unnamed_arg0",
     (gchar *) "s",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_timezone_IN_ARG_user_interaction =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_timezone_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
-    (gchar *) "user_interaction",
+    (gchar *) "unnamed_arg1",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _timedate1_method_info_set_timezone_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _timedated_timedate1_method_info_set_timezone_IN_ARG_pointers[] =
 {
-  &_timedate1_method_info_set_timezone_IN_ARG_timezone,
-  &_timedate1_method_info_set_timezone_IN_ARG_user_interaction,
+  &_timedated_timedate1_method_info_set_timezone_IN_ARG_unnamed_arg0,
+  &_timedated_timedate1_method_info_set_timezone_IN_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _timedate1_method_info_set_timezone =
+static const _ExtendedGDBusMethodInfo _timedated_timedate1_method_info_set_timezone =
 {
   {
     -1,
     (gchar *) "SetTimezone",
-    (GDBusArgInfo **) &_timedate1_method_info_set_timezone_IN_ARG_pointers,
+    (GDBusArgInfo **) &_timedated_timedate1_method_info_set_timezone_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -259,53 +259,53 @@ static const _ExtendedGDBusMethodInfo _timedate1_method_info_set_timezone =
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_local_rtc_IN_ARG_local_rtc =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_local_rtc_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
-    (gchar *) "local_rtc",
+    (gchar *) "unnamed_arg0",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_local_rtc_IN_ARG_fix_system =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_local_rtc_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
-    (gchar *) "fix_system",
+    (gchar *) "unnamed_arg1",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_local_rtc_IN_ARG_user_interaction =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_local_rtc_IN_ARG_unnamed_arg2 =
 {
   {
     -1,
-    (gchar *) "user_interaction",
+    (gchar *) "unnamed_arg2",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _timedate1_method_info_set_local_rtc_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _timedated_timedate1_method_info_set_local_rtc_IN_ARG_pointers[] =
 {
-  &_timedate1_method_info_set_local_rtc_IN_ARG_local_rtc,
-  &_timedate1_method_info_set_local_rtc_IN_ARG_fix_system,
-  &_timedate1_method_info_set_local_rtc_IN_ARG_user_interaction,
+  &_timedated_timedate1_method_info_set_local_rtc_IN_ARG_unnamed_arg0,
+  &_timedated_timedate1_method_info_set_local_rtc_IN_ARG_unnamed_arg1,
+  &_timedated_timedate1_method_info_set_local_rtc_IN_ARG_unnamed_arg2,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _timedate1_method_info_set_local_rtc =
+static const _ExtendedGDBusMethodInfo _timedated_timedate1_method_info_set_local_rtc =
 {
   {
     -1,
     (gchar *) "SetLocalRTC",
-    (GDBusArgInfo **) &_timedate1_method_info_set_local_rtc_IN_ARG_pointers,
+    (GDBusArgInfo **) &_timedated_timedate1_method_info_set_local_rtc_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -313,41 +313,41 @@ static const _ExtendedGDBusMethodInfo _timedate1_method_info_set_local_rtc =
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_ntp_IN_ARG_use_ntp =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_ntp_IN_ARG_unnamed_arg0 =
 {
   {
     -1,
-    (gchar *) "use_ntp",
+    (gchar *) "unnamed_arg0",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo _timedate1_method_info_set_ntp_IN_ARG_user_interaction =
+static const _ExtendedGDBusArgInfo _timedated_timedate1_method_info_set_ntp_IN_ARG_unnamed_arg1 =
 {
   {
     -1,
-    (gchar *) "user_interaction",
+    (gchar *) "unnamed_arg1",
     (gchar *) "b",
     NULL
   },
   FALSE
 };
 
-static const _ExtendedGDBusArgInfo * const _timedate1_method_info_set_ntp_IN_ARG_pointers[] =
+static const _ExtendedGDBusArgInfo * const _timedated_timedate1_method_info_set_ntp_IN_ARG_pointers[] =
 {
-  &_timedate1_method_info_set_ntp_IN_ARG_use_ntp,
-  &_timedate1_method_info_set_ntp_IN_ARG_user_interaction,
+  &_timedated_timedate1_method_info_set_ntp_IN_ARG_unnamed_arg0,
+  &_timedated_timedate1_method_info_set_ntp_IN_ARG_unnamed_arg1,
   NULL
 };
 
-static const _ExtendedGDBusMethodInfo _timedate1_method_info_set_ntp =
+static const _ExtendedGDBusMethodInfo _timedated_timedate1_method_info_set_ntp =
 {
   {
     -1,
     (gchar *) "SetNTP",
-    (GDBusArgInfo **) &_timedate1_method_info_set_ntp_IN_ARG_pointers,
+    (GDBusArgInfo **) &_timedated_timedate1_method_info_set_ntp_IN_ARG_pointers,
     NULL,
     NULL
   },
@@ -355,16 +355,16 @@ static const _ExtendedGDBusMethodInfo _timedate1_method_info_set_ntp =
   FALSE
 };
 
-static const _ExtendedGDBusMethodInfo * const _timedate1_method_info_pointers[] =
+static const _ExtendedGDBusMethodInfo * const _timedated_timedate1_method_info_pointers[] =
 {
-  &_timedate1_method_info_set_time,
-  &_timedate1_method_info_set_timezone,
-  &_timedate1_method_info_set_local_rtc,
-  &_timedate1_method_info_set_ntp,
+  &_timedated_timedate1_method_info_set_time,
+  &_timedated_timedate1_method_info_set_timezone,
+  &_timedated_timedate1_method_info_set_local_rtc,
+  &_timedated_timedate1_method_info_set_ntp,
   NULL
 };
 
-static const _ExtendedGDBusPropertyInfo _timedate1_property_info_timezone =
+static const _ExtendedGDBusPropertyInfo _timedated_timedate1_property_info_timezone =
 {
   {
     -1,
@@ -377,7 +377,7 @@ static const _ExtendedGDBusPropertyInfo _timedate1_property_info_timezone =
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _timedate1_property_info_local_rtc =
+static const _ExtendedGDBusPropertyInfo _timedated_timedate1_property_info_local_rtc =
 {
   {
     -1,
@@ -390,7 +390,34 @@ static const _ExtendedGDBusPropertyInfo _timedate1_property_info_local_rtc =
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo _timedate1_property_info_ntp =
+static const GDBusAnnotationInfo _timedated_timedate1_property_can_ntp_annotation_info_0 =
+{
+  -1,
+  (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
+  (gchar *) "false",
+  NULL
+};
+
+static const GDBusAnnotationInfo * const _timedated_timedate1_property_can_ntp_annotation_info_pointers[] =
+{
+  &_timedated_timedate1_property_can_ntp_annotation_info_0,
+  NULL
+};
+
+static const _ExtendedGDBusPropertyInfo _timedated_timedate1_property_info_can_ntp =
+{
+  {
+    -1,
+    (gchar *) "CanNTP",
+    (gchar *) "b",
+    G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+    (GDBusAnnotationInfo **) &_timedated_timedate1_property_can_ntp_annotation_info_pointers
+  },
+  "can-ntp",
+  FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo _timedated_timedate1_property_info_ntp =
 {
   {
     -1,
@@ -403,22 +430,107 @@ static const _ExtendedGDBusPropertyInfo _timedate1_property_info_ntp =
   FALSE
 };
 
-static const _ExtendedGDBusPropertyInfo * const _timedate1_property_info_pointers[] =
+static const GDBusAnnotationInfo _timedated_timedate1_property_ntpsynchronized_annotation_info_0 =
+{
+  -1,
+  (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
+  (gchar *) "false",
+  NULL
+};
+
+static const GDBusAnnotationInfo * const _timedated_timedate1_property_ntpsynchronized_annotation_info_pointers[] =
+{
+  &_timedated_timedate1_property_ntpsynchronized_annotation_info_0,
+  NULL
+};
+
+static const _ExtendedGDBusPropertyInfo _timedated_timedate1_property_info_ntpsynchronized =
+{
+  {
+    -1,
+    (gchar *) "NTPSynchronized",
+    (gchar *) "b",
+    G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+    (GDBusAnnotationInfo **) &_timedated_timedate1_property_ntpsynchronized_annotation_info_pointers
+  },
+  "ntpsynchronized",
+  FALSE
+};
+
+static const GDBusAnnotationInfo _timedated_timedate1_property_time_usec_annotation_info_0 =
+{
+  -1,
+  (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
+  (gchar *) "false",
+  NULL
+};
+
+static const GDBusAnnotationInfo * const _timedated_timedate1_property_time_usec_annotation_info_pointers[] =
+{
+  &_timedated_timedate1_property_time_usec_annotation_info_0,
+  NULL
+};
+
+static const _ExtendedGDBusPropertyInfo _timedated_timedate1_property_info_time_usec =
+{
+  {
+    -1,
+    (gchar *) "TimeUSec",
+    (gchar *) "t",
+    G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+    (GDBusAnnotationInfo **) &_timedated_timedate1_property_time_usec_annotation_info_pointers
+  },
+  "time-usec",
+  FALSE
+};
+
+static const GDBusAnnotationInfo _timedated_timedate1_property_rtctime_usec_annotation_info_0 =
 {
-  &_timedate1_property_info_timezone,
-  &_timedate1_property_info_local_rtc,
-  &_timedate1_property_info_ntp,
+  -1,
+  (gchar *) "org.freedesktop.DBus.Property.EmitsChangedSignal",
+  (gchar *) "false",
   NULL
 };
 
-static const _ExtendedGDBusInterfaceInfo _timedate1_interface_info =
+static const GDBusAnnotationInfo * const _timedated_timedate1_property_rtctime_usec_annotation_info_pointers[] =
+{
+  &_timedated_timedate1_property_rtctime_usec_annotation_info_0,
+  NULL
+};
+
+static const _ExtendedGDBusPropertyInfo _timedated_timedate1_property_info_rtctime_usec =
+{
+  {
+    -1,
+    (gchar *) "RTCTimeUSec",
+    (gchar *) "t",
+    G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
+    (GDBusAnnotationInfo **) &_timedated_timedate1_property_rtctime_usec_annotation_info_pointers
+  },
+  "rtctime-usec",
+  FALSE
+};
+
+static const _ExtendedGDBusPropertyInfo * const _timedated_timedate1_property_info_pointers[] =
+{
+  &_timedated_timedate1_property_info_timezone,
+  &_timedated_timedate1_property_info_local_rtc,
+  &_timedated_timedate1_property_info_can_ntp,
+  &_timedated_timedate1_property_info_ntp,
+  &_timedated_timedate1_property_info_ntpsynchronized,
+  &_timedated_timedate1_property_info_time_usec,
+  &_timedated_timedate1_property_info_rtctime_usec,
+  NULL
+};
+
+static const _ExtendedGDBusInterfaceInfo _timedated_timedate1_interface_info =
 {
   {
     -1,
     (gchar *) "org.freedesktop.timedate1",
-    (GDBusMethodInfo **) &_timedate1_method_info_pointers,
+    (GDBusMethodInfo **) &_timedated_timedate1_method_info_pointers,
     NULL,
-    (GDBusPropertyInfo **) &_timedate1_property_info_pointers,
+    (GDBusPropertyInfo **) &_timedated_timedate1_property_info_pointers,
     NULL
   },
   "timedate1",
@@ -426,84 +538,92 @@ static const _ExtendedGDBusInterfaceInfo _timedate1_interface_info =
 
 
 /**
- * timedate1_interface_info:
+ * timedated_timedate1_interface_info:
  *
  * Gets a machine-readable description of the <link linkend="gdbus-interface-org-freedesktop-timedate1.top_of_page">org.freedesktop.timedate1</link> D-Bus interface.
  *
  * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
  */
 GDBusInterfaceInfo *
-timedate1_interface_info (void)
+timedated_timedate1_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_timedate1_interface_info.parent_struct;
+  return (GDBusInterfaceInfo *) &_timedated_timedate1_interface_info.parent_struct;
 }
 
 /**
- * timedate1_override_properties:
+ * timedated_timedate1_override_properties:
  * @klass: The class structure for a #GObject<!-- -->-derived class.
  * @property_id_begin: The property id to assign to the first overridden property.
  *
- * Overrides all #GObject properties in the #Timedate1 interface for a concrete class.
+ * Overrides all #GObject properties in the #timedatedTimedate1 interface for a concrete class.
  * The properties are overridden in the order they are defined.
  *
  * Returns: The last property id.
  */
 guint
-timedate1_override_properties (GObjectClass *klass, guint property_id_begin)
+timedated_timedate1_override_properties (GObjectClass *klass, guint property_id_begin)
 {
   g_object_class_override_property (klass, property_id_begin++, "timezone");
   g_object_class_override_property (klass, property_id_begin++, "local-rtc");
+  g_object_class_override_property (klass, property_id_begin++, "can-ntp");
   g_object_class_override_property (klass, property_id_begin++, "ntp");
+  g_object_class_override_property (klass, property_id_begin++, "ntpsynchronized");
+  g_object_class_override_property (klass, property_id_begin++, "time-usec");
+  g_object_class_override_property (klass, property_id_begin++, "rtctime-usec");
   return property_id_begin - 1;
 }
 
 
 
 /**
- * Timedate1:
+ * timedatedTimedate1:
  *
  * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-timedate1.top_of_page">org.freedesktop.timedate1</link>.
  */
 
 /**
- * Timedate1Iface:
+ * timedatedTimedate1Iface:
  * @parent_iface: The parent interface.
- * @handle_set_local_rtc: Handler for the #Timedate1::handle-set-local-rtc signal.
- * @handle_set_ntp: Handler for the #Timedate1::handle-set-ntp signal.
- * @handle_set_time: Handler for the #Timedate1::handle-set-time signal.
- * @handle_set_timezone: Handler for the #Timedate1::handle-set-timezone signal.
- * @get_local_rtc: Getter for the #Timedate1:local-rtc property.
- * @get_ntp: Getter for the #Timedate1:ntp property.
- * @get_timezone: Getter for the #Timedate1:timezone property.
+ * @handle_set_local_rtc: Handler for the #timedatedTimedate1::handle-set-local-rtc signal.
+ * @handle_set_ntp: Handler for the #timedatedTimedate1::handle-set-ntp signal.
+ * @handle_set_time: Handler for the #timedatedTimedate1::handle-set-time signal.
+ * @handle_set_timezone: Handler for the #timedatedTimedate1::handle-set-timezone signal.
+ * @get_can_ntp: Getter for the #timedatedTimedate1:can-ntp property.
+ * @get_local_rtc: Getter for the #timedatedTimedate1:local-rtc property.
+ * @get_ntp: Getter for the #timedatedTimedate1:ntp property.
+ * @get_ntpsynchronized: Getter for the #timedatedTimedate1:ntpsynchronized property.
+ * @get_rtctime_usec: Getter for the #timedatedTimedate1:rtctime-usec property.
+ * @get_time_usec: Getter for the #timedatedTimedate1:time-usec property.
+ * @get_timezone: Getter for the #timedatedTimedate1:timezone property.
  *
  * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-timedate1.top_of_page">org.freedesktop.timedate1</link>.
  */
 
-typedef Timedate1Iface Timedate1Interface;
-G_DEFINE_INTERFACE (Timedate1, timedate1, G_TYPE_OBJECT);
+typedef timedatedTimedate1Iface timedatedTimedate1Interface;
+G_DEFINE_INTERFACE (timedatedTimedate1, timedated_timedate1, G_TYPE_OBJECT);
 
 static void
-timedate1_default_init (Timedate1Iface *iface)
+timedated_timedate1_default_init (timedatedTimedate1Iface *iface)
 {
   /* GObject signals for incoming D-Bus method calls: */
   /**
-   * Timedate1::handle-set-time:
-   * @object: A #Timedate1.
+   * timedatedTimedate1::handle-set-time:
+   * @object: A #timedatedTimedate1.
    * @invocation: A #GDBusMethodInvocation.
-   * @arg_usec_utc: Argument passed by remote caller.
-   * @arg_relative: Argument passed by remote caller.
-   * @arg_user_interaction: Argument passed by remote caller.
+   * @arg_unnamed_arg0: Argument passed by remote caller.
+   * @arg_unnamed_arg1: Argument passed by remote caller.
+   * @arg_unnamed_arg2: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-timedate1.SetTime">SetTime()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call timedate1_complete_set_time() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call timedated_timedate1_complete_set_time() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-set-time",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Timedate1Iface, handle_set_time),
+    G_STRUCT_OFFSET (timedatedTimedate1Iface, handle_set_time),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -512,22 +632,22 @@ timedate1_default_init (Timedate1Iface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_INT64, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 
   /**
-   * Timedate1::handle-set-timezone:
-   * @object: A #Timedate1.
+   * timedatedTimedate1::handle-set-timezone:
+   * @object: A #timedatedTimedate1.
    * @invocation: A #GDBusMethodInvocation.
-   * @arg_timezone: Argument passed by remote caller.
-   * @arg_user_interaction: Argument passed by remote caller.
+   * @arg_unnamed_arg0: Argument passed by remote caller.
+   * @arg_unnamed_arg1: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-timedate1.SetTimezone">SetTimezone()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call timedate1_complete_set_timezone() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call timedated_timedate1_complete_set_timezone() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-set-timezone",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Timedate1Iface, handle_set_timezone),
+    G_STRUCT_OFFSET (timedatedTimedate1Iface, handle_set_timezone),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -536,23 +656,23 @@ timedate1_default_init (Timedate1Iface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
   /**
-   * Timedate1::handle-set-local-rtc:
-   * @object: A #Timedate1.
+   * timedatedTimedate1::handle-set-local-rtc:
+   * @object: A #timedatedTimedate1.
    * @invocation: A #GDBusMethodInvocation.
-   * @arg_local_rtc: Argument passed by remote caller.
-   * @arg_fix_system: Argument passed by remote caller.
-   * @arg_user_interaction: Argument passed by remote caller.
+   * @arg_unnamed_arg0: Argument passed by remote caller.
+   * @arg_unnamed_arg1: Argument passed by remote caller.
+   * @arg_unnamed_arg2: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-timedate1.SetLocalRTC">SetLocalRTC()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call timedate1_complete_set_local_rtc() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call timedated_timedate1_complete_set_local_rtc() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-set-local-rtc",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Timedate1Iface, handle_set_local_rtc),
+    G_STRUCT_OFFSET (timedatedTimedate1Iface, handle_set_local_rtc),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -561,22 +681,22 @@ timedate1_default_init (Timedate1Iface *iface)
     G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 
   /**
-   * Timedate1::handle-set-ntp:
-   * @object: A #Timedate1.
+   * timedatedTimedate1::handle-set-ntp:
+   * @object: A #timedatedTimedate1.
    * @invocation: A #GDBusMethodInvocation.
-   * @arg_use_ntp: Argument passed by remote caller.
-   * @arg_user_interaction: Argument passed by remote caller.
+   * @arg_unnamed_arg0: Argument passed by remote caller.
+   * @arg_unnamed_arg1: Argument passed by remote caller.
    *
    * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-timedate1.SetNTP">SetNTP()</link> D-Bus method.
    *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call timedate1_complete_set_ntp() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
+   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call timedated_timedate1_complete_set_ntp() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
    *
    * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
    */
   g_signal_new ("handle-set-ntp",
     G_TYPE_FROM_INTERFACE (iface),
     G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (Timedate1Iface, handle_set_ntp),
+    G_STRUCT_OFFSET (timedatedTimedate1Iface, handle_set_ntp),
     g_signal_accumulator_true_handled,
     NULL,
     g_cclosure_marshal_generic,
@@ -586,7 +706,7 @@ timedate1_default_init (Timedate1Iface *iface)
 
   /* GObject properties for D-Bus properties: */
   /**
-   * Timedate1:timezone:
+   * timedatedTimedate1:timezone:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-timedate1.Timezone">"Timezone"</link>.
    *
@@ -595,7 +715,7 @@ timedate1_default_init (Timedate1Iface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_string ("timezone", "Timezone", "Timezone", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Timedate1:local-rtc:
+   * timedatedTimedate1:local-rtc:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-timedate1.LocalRTC">"LocalRTC"</link>.
    *
@@ -604,7 +724,16 @@ timedate1_default_init (Timedate1Iface *iface)
   g_object_interface_install_property (iface,
     g_param_spec_boolean ("local-rtc", "LocalRTC", "LocalRTC", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * Timedate1:ntp:
+   * timedatedTimedate1:can-ntp:
+   *
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-timedate1.CanNTP">"CanNTP"</link>.
+   *
+   * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+   */
+  g_object_interface_install_property (iface,
+    g_param_spec_boolean ("can-ntp", "CanNTP", "CanNTP", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  /**
+   * timedatedTimedate1:ntp:
    *
    * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-timedate1.NTP">"NTP"</link>.
    *
@@ -612,29 +741,56 @@ timedate1_default_init (Timedate1Iface *iface)
    */
   g_object_interface_install_property (iface,
     g_param_spec_boolean ("ntp", "NTP", "NTP", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  /**
+   * timedatedTimedate1:ntpsynchronized:
+   *
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-timedate1.NTPSynchronized">"NTPSynchronized"</link>.
+   *
+   * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+   */
+  g_object_interface_install_property (iface,
+    g_param_spec_boolean ("ntpsynchronized", "NTPSynchronized", "NTPSynchronized", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  /**
+   * timedatedTimedate1:time-usec:
+   *
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-timedate1.TimeUSec">"TimeUSec"</link>.
+   *
+   * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+   */
+  g_object_interface_install_property (iface,
+    g_param_spec_uint64 ("time-usec", "TimeUSec", "TimeUSec", 0, G_MAXUINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  /**
+   * timedatedTimedate1:rtctime-usec:
+   *
+   * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-timedate1.RTCTimeUSec">"RTCTimeUSec"</link>.
+   *
+   * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
+   */
+  g_object_interface_install_property (iface,
+    g_param_spec_uint64 ("rtctime-usec", "RTCTimeUSec", "RTCTimeUSec", 0, G_MAXUINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 /**
- * timedate1_get_timezone: (skip)
- * @object: A #Timedate1.
+ * timedated_timedate1_get_timezone: (skip)
+ * @object: A #timedatedTimedate1.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-timedate1.Timezone">"Timezone"</link> D-Bus property.
  *
  * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
  *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use timedate1_dup_timezone() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use timedated_timedate1_dup_timezone() if on another thread.</warning>
  *
  * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
  */
 const gchar *
-timedate1_get_timezone (Timedate1 *object)
+timedated_timedate1_get_timezone (timedatedTimedate1 *object)
 {
-  return TIMEDATE1_GET_IFACE (object)->get_timezone (object);
+  return TIMEDATED_TIMEDATE1_GET_IFACE (object)->get_timezone (object);
 }
 
 /**
- * timedate1_dup_timezone: (skip)
- * @object: A #Timedate1.
+ * timedated_timedate1_dup_timezone: (skip)
+ * @object: A #timedatedTimedate1.
  *
  * Gets a copy of the <link linkend="gdbus-property-org-freedesktop-timedate1.Timezone">"Timezone"</link> D-Bus property.
  *
@@ -643,7 +799,7 @@ timedate1_get_timezone (Timedate1 *object)
  * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
  */
 gchar *
-timedate1_dup_timezone (Timedate1 *object)
+timedated_timedate1_dup_timezone (timedatedTimedate1 *object)
 {
   gchar *value;
   g_object_get (G_OBJECT (object), "timezone", &value, NULL);
@@ -651,8 +807,8 @@ timedate1_dup_timezone (Timedate1 *object)
 }
 
 /**
- * timedate1_set_timezone: (skip)
- * @object: A #Timedate1.
+ * timedated_timedate1_set_timezone: (skip)
+ * @object: A #timedatedTimedate1.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-timedate1.Timezone">"Timezone"</link> D-Bus property to @value.
@@ -660,14 +816,14 @@ timedate1_dup_timezone (Timedate1 *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-timedate1_set_timezone (Timedate1 *object, const gchar *value)
+timedated_timedate1_set_timezone (timedatedTimedate1 *object, const gchar *value)
 {
   g_object_set (G_OBJECT (object), "timezone", value, NULL);
 }
 
 /**
- * timedate1_get_local_rtc: (skip)
- * @object: A #Timedate1.
+ * timedated_timedate1_get_local_rtc: (skip)
+ * @object: A #timedatedTimedate1.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-timedate1.LocalRTC">"LocalRTC"</link> D-Bus property.
  *
@@ -676,14 +832,14 @@ timedate1_set_timezone (Timedate1 *object, const gchar *value)
  * Returns: The property value.
  */
 gboolean 
-timedate1_get_local_rtc (Timedate1 *object)
+timedated_timedate1_get_local_rtc (timedatedTimedate1 *object)
 {
-  return TIMEDATE1_GET_IFACE (object)->get_local_rtc (object);
+  return TIMEDATED_TIMEDATE1_GET_IFACE (object)->get_local_rtc (object);
 }
 
 /**
- * timedate1_set_local_rtc: (skip)
- * @object: A #Timedate1.
+ * timedated_timedate1_set_local_rtc: (skip)
+ * @object: A #timedatedTimedate1.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-timedate1.LocalRTC">"LocalRTC"</link> D-Bus property to @value.
@@ -691,14 +847,45 @@ timedate1_get_local_rtc (Timedate1 *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-timedate1_set_local_rtc (Timedate1 *object, gboolean value)
+timedated_timedate1_set_local_rtc (timedatedTimedate1 *object, gboolean value)
 {
   g_object_set (G_OBJECT (object), "local-rtc", value, NULL);
 }
 
 /**
- * timedate1_get_ntp: (skip)
- * @object: A #Timedate1.
+ * timedated_timedate1_get_can_ntp: (skip)
+ * @object: A #timedatedTimedate1.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-timedate1.CanNTP">"CanNTP"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+timedated_timedate1_get_can_ntp (timedatedTimedate1 *object)
+{
+  return TIMEDATED_TIMEDATE1_GET_IFACE (object)->get_can_ntp (object);
+}
+
+/**
+ * timedated_timedate1_set_can_ntp: (skip)
+ * @object: A #timedatedTimedate1.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-freedesktop-timedate1.CanNTP">"CanNTP"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+timedated_timedate1_set_can_ntp (timedatedTimedate1 *object, gboolean value)
+{
+  g_object_set (G_OBJECT (object), "can-ntp", value, NULL);
+}
+
+/**
+ * timedated_timedate1_get_ntp: (skip)
+ * @object: A #timedatedTimedate1.
  *
  * Gets the value of the <link linkend="gdbus-property-org-freedesktop-timedate1.NTP">"NTP"</link> D-Bus property.
  *
@@ -707,14 +894,14 @@ timedate1_set_local_rtc (Timedate1 *object, gboolean value)
  * Returns: The property value.
  */
 gboolean 
-timedate1_get_ntp (Timedate1 *object)
+timedated_timedate1_get_ntp (timedatedTimedate1 *object)
 {
-  return TIMEDATE1_GET_IFACE (object)->get_ntp (object);
+  return TIMEDATED_TIMEDATE1_GET_IFACE (object)->get_ntp (object);
 }
 
 /**
- * timedate1_set_ntp: (skip)
- * @object: A #Timedate1.
+ * timedated_timedate1_set_ntp: (skip)
+ * @object: A #timedatedTimedate1.
  * @value: The value to set.
  *
  * Sets the <link linkend="gdbus-property-org-freedesktop-timedate1.NTP">"NTP"</link> D-Bus property to @value.
@@ -722,33 +909,126 @@ timedate1_get_ntp (Timedate1 *object)
  * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
  */
 void
-timedate1_set_ntp (Timedate1 *object, gboolean value)
+timedated_timedate1_set_ntp (timedatedTimedate1 *object, gboolean value)
 {
   g_object_set (G_OBJECT (object), "ntp", value, NULL);
 }
 
 /**
- * timedate1_call_set_time:
- * @proxy: A #Timedate1Proxy.
- * @arg_usec_utc: Argument to pass with the method invocation.
- * @arg_relative: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * timedated_timedate1_get_ntpsynchronized: (skip)
+ * @object: A #timedatedTimedate1.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-timedate1.NTPSynchronized">"NTPSynchronized"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+gboolean 
+timedated_timedate1_get_ntpsynchronized (timedatedTimedate1 *object)
+{
+  return TIMEDATED_TIMEDATE1_GET_IFACE (object)->get_ntpsynchronized (object);
+}
+
+/**
+ * timedated_timedate1_set_ntpsynchronized: (skip)
+ * @object: A #timedatedTimedate1.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-freedesktop-timedate1.NTPSynchronized">"NTPSynchronized"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+timedated_timedate1_set_ntpsynchronized (timedatedTimedate1 *object, gboolean value)
+{
+  g_object_set (G_OBJECT (object), "ntpsynchronized", value, NULL);
+}
+
+/**
+ * timedated_timedate1_get_time_usec: (skip)
+ * @object: A #timedatedTimedate1.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-timedate1.TimeUSec">"TimeUSec"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+guint64 
+timedated_timedate1_get_time_usec (timedatedTimedate1 *object)
+{
+  return TIMEDATED_TIMEDATE1_GET_IFACE (object)->get_time_usec (object);
+}
+
+/**
+ * timedated_timedate1_set_time_usec: (skip)
+ * @object: A #timedatedTimedate1.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-freedesktop-timedate1.TimeUSec">"TimeUSec"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+timedated_timedate1_set_time_usec (timedatedTimedate1 *object, guint64 value)
+{
+  g_object_set (G_OBJECT (object), "time-usec", value, NULL);
+}
+
+/**
+ * timedated_timedate1_get_rtctime_usec: (skip)
+ * @object: A #timedatedTimedate1.
+ *
+ * Gets the value of the <link linkend="gdbus-property-org-freedesktop-timedate1.RTCTimeUSec">"RTCTimeUSec"</link> D-Bus property.
+ *
+ * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
+ *
+ * Returns: The property value.
+ */
+guint64 
+timedated_timedate1_get_rtctime_usec (timedatedTimedate1 *object)
+{
+  return TIMEDATED_TIMEDATE1_GET_IFACE (object)->get_rtctime_usec (object);
+}
+
+/**
+ * timedated_timedate1_set_rtctime_usec: (skip)
+ * @object: A #timedatedTimedate1.
+ * @value: The value to set.
+ *
+ * Sets the <link linkend="gdbus-property-org-freedesktop-timedate1.RTCTimeUSec">"RTCTimeUSec"</link> D-Bus property to @value.
+ *
+ * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
+ */
+void
+timedated_timedate1_set_rtctime_usec (timedatedTimedate1 *object, guint64 value)
+{
+  g_object_set (G_OBJECT (object), "rtctime-usec", value, NULL);
+}
+
+/**
+ * timedated_timedate1_call_set_time:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
+ * @arg_unnamed_arg2: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-timedate1.SetTime">SetTime()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call timedate1_call_set_time_finish() to get the result of the operation.
+ * You can then call timedated_timedate1_call_set_time_finish() to get the result of the operation.
  *
- * See timedate1_call_set_time_sync() for the synchronous, blocking version of this method.
+ * See timedated_timedate1_call_set_time_sync() for the synchronous, blocking version of this method.
  */
 void
-timedate1_call_set_time (
-    Timedate1 *proxy,
-    gint64 arg_usec_utc,
-    gboolean arg_relative,
-    gboolean arg_user_interaction,
+timedated_timedate1_call_set_time (
+    timedatedTimedate1 *proxy,
+    gint64 arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -756,9 +1036,9 @@ timedate1_call_set_time (
   g_dbus_proxy_call (G_DBUS_PROXY (proxy),
     "SetTime",
     g_variant_new ("(xbb)",
-                   arg_usec_utc,
-                   arg_relative,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1,
+                   arg_unnamed_arg2),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -767,18 +1047,18 @@ timedate1_call_set_time (
 }
 
 /**
- * timedate1_call_set_time_finish:
- * @proxy: A #Timedate1Proxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedate1_call_set_time().
+ * timedated_timedate1_call_set_time_finish:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedated_timedate1_call_set_time().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with timedate1_call_set_time().
+ * Finishes an operation started with timedated_timedate1_call_set_time().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-timedate1_call_set_time_finish (
-    Timedate1 *proxy,
+timedated_timedate1_call_set_time_finish (
+    timedatedTimedate1 *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -794,26 +1074,26 @@ _out:
 }
 
 /**
- * timedate1_call_set_time_sync:
- * @proxy: A #Timedate1Proxy.
- * @arg_usec_utc: Argument to pass with the method invocation.
- * @arg_relative: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * timedated_timedate1_call_set_time_sync:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
+ * @arg_unnamed_arg2: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-timedate1.SetTime">SetTime()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See timedate1_call_set_time() for the asynchronous version of this method.
+ * See timedated_timedate1_call_set_time() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-timedate1_call_set_time_sync (
-    Timedate1 *proxy,
-    gint64 arg_usec_utc,
-    gboolean arg_relative,
-    gboolean arg_user_interaction,
+timedated_timedate1_call_set_time_sync (
+    timedatedTimedate1 *proxy,
+    gint64 arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GError **error)
 {
@@ -821,9 +1101,9 @@ timedate1_call_set_time_sync (
   _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
     "SetTime",
     g_variant_new ("(xbb)",
-                   arg_usec_utc,
-                   arg_relative,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1,
+                   arg_unnamed_arg2),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -838,25 +1118,25 @@ _out:
 }
 
 /**
- * timedate1_call_set_timezone:
- * @proxy: A #Timedate1Proxy.
- * @arg_timezone: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * timedated_timedate1_call_set_timezone:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-timedate1.SetTimezone">SetTimezone()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call timedate1_call_set_timezone_finish() to get the result of the operation.
+ * You can then call timedated_timedate1_call_set_timezone_finish() to get the result of the operation.
  *
- * See timedate1_call_set_timezone_sync() for the synchronous, blocking version of this method.
+ * See timedated_timedate1_call_set_timezone_sync() for the synchronous, blocking version of this method.
  */
 void
-timedate1_call_set_timezone (
-    Timedate1 *proxy,
-    const gchar *arg_timezone,
-    gboolean arg_user_interaction,
+timedated_timedate1_call_set_timezone (
+    timedatedTimedate1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -864,8 +1144,8 @@ timedate1_call_set_timezone (
   g_dbus_proxy_call (G_DBUS_PROXY (proxy),
     "SetTimezone",
     g_variant_new ("(sb)",
-                   arg_timezone,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -874,18 +1154,18 @@ timedate1_call_set_timezone (
 }
 
 /**
- * timedate1_call_set_timezone_finish:
- * @proxy: A #Timedate1Proxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedate1_call_set_timezone().
+ * timedated_timedate1_call_set_timezone_finish:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedated_timedate1_call_set_timezone().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with timedate1_call_set_timezone().
+ * Finishes an operation started with timedated_timedate1_call_set_timezone().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-timedate1_call_set_timezone_finish (
-    Timedate1 *proxy,
+timedated_timedate1_call_set_timezone_finish (
+    timedatedTimedate1 *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -901,24 +1181,24 @@ _out:
 }
 
 /**
- * timedate1_call_set_timezone_sync:
- * @proxy: A #Timedate1Proxy.
- * @arg_timezone: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * timedated_timedate1_call_set_timezone_sync:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-timedate1.SetTimezone">SetTimezone()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See timedate1_call_set_timezone() for the asynchronous version of this method.
+ * See timedated_timedate1_call_set_timezone() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-timedate1_call_set_timezone_sync (
-    Timedate1 *proxy,
-    const gchar *arg_timezone,
-    gboolean arg_user_interaction,
+timedated_timedate1_call_set_timezone_sync (
+    timedatedTimedate1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GError **error)
 {
@@ -926,8 +1206,8 @@ timedate1_call_set_timezone_sync (
   _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
     "SetTimezone",
     g_variant_new ("(sb)",
-                   arg_timezone,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -942,27 +1222,27 @@ _out:
 }
 
 /**
- * timedate1_call_set_local_rtc:
- * @proxy: A #Timedate1Proxy.
- * @arg_local_rtc: Argument to pass with the method invocation.
- * @arg_fix_system: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * timedated_timedate1_call_set_local_rtc:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
+ * @arg_unnamed_arg2: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-timedate1.SetLocalRTC">SetLocalRTC()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call timedate1_call_set_local_rtc_finish() to get the result of the operation.
+ * You can then call timedated_timedate1_call_set_local_rtc_finish() to get the result of the operation.
  *
- * See timedate1_call_set_local_rtc_sync() for the synchronous, blocking version of this method.
+ * See timedated_timedate1_call_set_local_rtc_sync() for the synchronous, blocking version of this method.
  */
 void
-timedate1_call_set_local_rtc (
-    Timedate1 *proxy,
-    gboolean arg_local_rtc,
-    gboolean arg_fix_system,
-    gboolean arg_user_interaction,
+timedated_timedate1_call_set_local_rtc (
+    timedatedTimedate1 *proxy,
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -970,9 +1250,9 @@ timedate1_call_set_local_rtc (
   g_dbus_proxy_call (G_DBUS_PROXY (proxy),
     "SetLocalRTC",
     g_variant_new ("(bbb)",
-                   arg_local_rtc,
-                   arg_fix_system,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1,
+                   arg_unnamed_arg2),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -981,18 +1261,18 @@ timedate1_call_set_local_rtc (
 }
 
 /**
- * timedate1_call_set_local_rtc_finish:
- * @proxy: A #Timedate1Proxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedate1_call_set_local_rtc().
+ * timedated_timedate1_call_set_local_rtc_finish:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedated_timedate1_call_set_local_rtc().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with timedate1_call_set_local_rtc().
+ * Finishes an operation started with timedated_timedate1_call_set_local_rtc().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-timedate1_call_set_local_rtc_finish (
-    Timedate1 *proxy,
+timedated_timedate1_call_set_local_rtc_finish (
+    timedatedTimedate1 *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -1008,26 +1288,26 @@ _out:
 }
 
 /**
- * timedate1_call_set_local_rtc_sync:
- * @proxy: A #Timedate1Proxy.
- * @arg_local_rtc: Argument to pass with the method invocation.
- * @arg_fix_system: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * timedated_timedate1_call_set_local_rtc_sync:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
+ * @arg_unnamed_arg2: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-timedate1.SetLocalRTC">SetLocalRTC()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See timedate1_call_set_local_rtc() for the asynchronous version of this method.
+ * See timedated_timedate1_call_set_local_rtc() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-timedate1_call_set_local_rtc_sync (
-    Timedate1 *proxy,
-    gboolean arg_local_rtc,
-    gboolean arg_fix_system,
-    gboolean arg_user_interaction,
+timedated_timedate1_call_set_local_rtc_sync (
+    timedatedTimedate1 *proxy,
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GError **error)
 {
@@ -1035,9 +1315,9 @@ timedate1_call_set_local_rtc_sync (
   _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
     "SetLocalRTC",
     g_variant_new ("(bbb)",
-                   arg_local_rtc,
-                   arg_fix_system,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1,
+                   arg_unnamed_arg2),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -1052,25 +1332,25 @@ _out:
 }
 
 /**
- * timedate1_call_set_ntp:
- * @proxy: A #Timedate1Proxy.
- * @arg_use_ntp: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * timedated_timedate1_call_set_ntp:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
  *
  * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-timedate1.SetNTP">SetNTP()</link> D-Bus method on @proxy.
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call timedate1_call_set_ntp_finish() to get the result of the operation.
+ * You can then call timedated_timedate1_call_set_ntp_finish() to get the result of the operation.
  *
- * See timedate1_call_set_ntp_sync() for the synchronous, blocking version of this method.
+ * See timedated_timedate1_call_set_ntp_sync() for the synchronous, blocking version of this method.
  */
 void
-timedate1_call_set_ntp (
-    Timedate1 *proxy,
-    gboolean arg_use_ntp,
-    gboolean arg_user_interaction,
+timedated_timedate1_call_set_ntp (
+    timedatedTimedate1 *proxy,
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -1078,8 +1358,8 @@ timedate1_call_set_ntp (
   g_dbus_proxy_call (G_DBUS_PROXY (proxy),
     "SetNTP",
     g_variant_new ("(bb)",
-                   arg_use_ntp,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -1088,18 +1368,18 @@ timedate1_call_set_ntp (
 }
 
 /**
- * timedate1_call_set_ntp_finish:
- * @proxy: A #Timedate1Proxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedate1_call_set_ntp().
+ * timedated_timedate1_call_set_ntp_finish:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedated_timedate1_call_set_ntp().
  * @error: Return location for error or %NULL.
  *
- * Finishes an operation started with timedate1_call_set_ntp().
+ * Finishes an operation started with timedated_timedate1_call_set_ntp().
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-timedate1_call_set_ntp_finish (
-    Timedate1 *proxy,
+timedated_timedate1_call_set_ntp_finish (
+    timedatedTimedate1 *proxy,
     GAsyncResult *res,
     GError **error)
 {
@@ -1115,24 +1395,24 @@ _out:
 }
 
 /**
- * timedate1_call_set_ntp_sync:
- * @proxy: A #Timedate1Proxy.
- * @arg_use_ntp: Argument to pass with the method invocation.
- * @arg_user_interaction: Argument to pass with the method invocation.
+ * timedated_timedate1_call_set_ntp_sync:
+ * @proxy: A #timedatedTimedate1Proxy.
+ * @arg_unnamed_arg0: Argument to pass with the method invocation.
+ * @arg_unnamed_arg1: Argument to pass with the method invocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
  * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-timedate1.SetNTP">SetNTP()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
  *
- * See timedate1_call_set_ntp() for the asynchronous version of this method.
+ * See timedated_timedate1_call_set_ntp() for the asynchronous version of this method.
  *
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-timedate1_call_set_ntp_sync (
-    Timedate1 *proxy,
-    gboolean arg_use_ntp,
-    gboolean arg_user_interaction,
+timedated_timedate1_call_set_ntp_sync (
+    timedatedTimedate1 *proxy,
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GError **error)
 {
@@ -1140,8 +1420,8 @@ timedate1_call_set_ntp_sync (
   _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
     "SetNTP",
     g_variant_new ("(bb)",
-                   arg_use_ntp,
-                   arg_user_interaction),
+                   arg_unnamed_arg0,
+                   arg_unnamed_arg1),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
     cancellable,
@@ -1156,8 +1436,8 @@ _out:
 }
 
 /**
- * timedate1_complete_set_time:
- * @object: A #Timedate1.
+ * timedated_timedate1_complete_set_time:
+ * @object: A #timedatedTimedate1.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-timedate1.SetTime">SetTime()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -1165,8 +1445,8 @@ _out:
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-timedate1_complete_set_time (
-    Timedate1 *object,
+timedated_timedate1_complete_set_time (
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -1174,8 +1454,8 @@ timedate1_complete_set_time (
 }
 
 /**
- * timedate1_complete_set_timezone:
- * @object: A #Timedate1.
+ * timedated_timedate1_complete_set_timezone:
+ * @object: A #timedatedTimedate1.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-timedate1.SetTimezone">SetTimezone()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -1183,8 +1463,8 @@ timedate1_complete_set_time (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-timedate1_complete_set_timezone (
-    Timedate1 *object,
+timedated_timedate1_complete_set_timezone (
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -1192,8 +1472,8 @@ timedate1_complete_set_timezone (
 }
 
 /**
- * timedate1_complete_set_local_rtc:
- * @object: A #Timedate1.
+ * timedated_timedate1_complete_set_local_rtc:
+ * @object: A #timedatedTimedate1.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-timedate1.SetLocalRTC">SetLocalRTC()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -1201,8 +1481,8 @@ timedate1_complete_set_timezone (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-timedate1_complete_set_local_rtc (
-    Timedate1 *object,
+timedated_timedate1_complete_set_local_rtc (
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -1210,8 +1490,8 @@ timedate1_complete_set_local_rtc (
 }
 
 /**
- * timedate1_complete_set_ntp:
- * @object: A #Timedate1.
+ * timedated_timedate1_complete_set_ntp:
+ * @object: A #timedatedTimedate1.
  * @invocation: (transfer full): A #GDBusMethodInvocation.
  *
  * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-timedate1.SetNTP">SetNTP()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
@@ -1219,8 +1499,8 @@ timedate1_complete_set_local_rtc (
  * This method will free @invocation, you cannot use it afterwards.
  */
 void
-timedate1_complete_set_ntp (
-    Timedate1 *object,
+timedated_timedate1_complete_set_ntp (
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation)
 {
   g_dbus_method_invocation_return_value (invocation,
@@ -1230,53 +1510,53 @@ timedate1_complete_set_ntp (
 /* ------------------------------------------------------------------------ */
 
 /**
- * Timedate1Proxy:
+ * timedatedTimedate1Proxy:
  *
- * The #Timedate1Proxy structure contains only private data and should only be accessed using the provided API.
+ * The #timedatedTimedate1Proxy structure contains only private data and should only be accessed using the provided API.
  */
 
 /**
- * Timedate1ProxyClass:
+ * timedatedTimedate1ProxyClass:
  * @parent_class: The parent class.
  *
- * Class structure for #Timedate1Proxy.
+ * Class structure for #timedatedTimedate1Proxy.
  */
 
-struct _Timedate1ProxyPrivate
+struct _timedatedTimedate1ProxyPrivate
 {
   GData *qdata;
 };
 
-static void timedate1_proxy_iface_init (Timedate1Iface *iface);
+static void timedated_timedate1_proxy_iface_init (timedatedTimedate1Iface *iface);
 
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (Timedate1Proxy, timedate1_proxy, G_TYPE_DBUS_PROXY,
-                         G_ADD_PRIVATE (Timedate1Proxy)
-                         G_IMPLEMENT_INTERFACE (TYPE_TIMEDATE1, timedate1_proxy_iface_init));
+G_DEFINE_TYPE_WITH_CODE (timedatedTimedate1Proxy, timedated_timedate1_proxy, G_TYPE_DBUS_PROXY,
+                         G_ADD_PRIVATE (timedatedTimedate1Proxy)
+                         G_IMPLEMENT_INTERFACE (TIMEDATED_TYPE_TIMEDATE1, timedated_timedate1_proxy_iface_init));
 
 #else
-G_DEFINE_TYPE_WITH_CODE (Timedate1Proxy, timedate1_proxy, G_TYPE_DBUS_PROXY,
-                         G_IMPLEMENT_INTERFACE (TYPE_TIMEDATE1, timedate1_proxy_iface_init));
+G_DEFINE_TYPE_WITH_CODE (timedatedTimedate1Proxy, timedated_timedate1_proxy, G_TYPE_DBUS_PROXY,
+                         G_IMPLEMENT_INTERFACE (TIMEDATED_TYPE_TIMEDATE1, timedated_timedate1_proxy_iface_init));
 
 #endif
 static void
-timedate1_proxy_finalize (GObject *object)
+timedated_timedate1_proxy_finalize (GObject *object)
 {
-  Timedate1Proxy *proxy = TIMEDATE1_PROXY (object);
+  timedatedTimedate1Proxy *proxy = TIMEDATED_TIMEDATE1_PROXY (object);
   g_datalist_clear (&proxy->priv->qdata);
-  G_OBJECT_CLASS (timedate1_proxy_parent_class)->finalize (object);
+  G_OBJECT_CLASS (timedated_timedate1_proxy_parent_class)->finalize (object);
 }
 
 static void
-timedate1_proxy_get_property (GObject      *object,
+timedated_timedate1_proxy_get_property (GObject      *object,
   guint         prop_id,
   GValue       *value,
   GParamSpec   *pspec G_GNUC_UNUSED)
 {
   const _ExtendedGDBusPropertyInfo *info;
   GVariant *variant;
-  g_assert (prop_id != 0 && prop_id - 1 < 3);
-  info = _timedate1_property_info_pointers[prop_id - 1];
+  g_assert (prop_id != 0 && prop_id - 1 < 7);
+  info = _timedated_timedate1_property_info_pointers[prop_id - 1];
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);
   if (info->use_gvariant)
     {
@@ -1292,7 +1572,7 @@ timedate1_proxy_get_property (GObject      *object,
 }
 
 static void
-timedate1_proxy_set_property_cb (GDBusProxy *proxy,
+timedated_timedate1_proxy_set_property_cb (GDBusProxy *proxy,
   GAsyncResult *res,
   gpointer      user_data)
 {
@@ -1315,27 +1595,27 @@ timedate1_proxy_set_property_cb (GDBusProxy *proxy,
 }
 
 static void
-timedate1_proxy_set_property (GObject      *object,
+timedated_timedate1_proxy_set_property (GObject      *object,
   guint         prop_id,
   const GValue *value,
   GParamSpec   *pspec G_GNUC_UNUSED)
 {
   const _ExtendedGDBusPropertyInfo *info;
   GVariant *variant;
-  g_assert (prop_id != 0 && prop_id - 1 < 3);
-  info = _timedate1_property_info_pointers[prop_id - 1];
+  g_assert (prop_id != 0 && prop_id - 1 < 7);
+  info = _timedated_timedate1_property_info_pointers[prop_id - 1];
   variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));
   g_dbus_proxy_call (G_DBUS_PROXY (object),
     "org.freedesktop.DBus.Properties.Set",
     g_variant_new ("(ssv)", "org.freedesktop.timedate1", info->parent_struct.name, variant),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
-    NULL, (GAsyncReadyCallback) timedate1_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
+    NULL, (GAsyncReadyCallback) timedated_timedate1_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
   g_variant_unref (variant);
 }
 
 static void
-timedate1_proxy_g_signal (GDBusProxy *proxy,
+timedated_timedate1_proxy_g_signal (GDBusProxy *proxy,
   const gchar *sender_name G_GNUC_UNUSED,
   const gchar *signal_name,
   GVariant *parameters)
@@ -1347,12 +1627,12 @@ timedate1_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_timedate1_interface_info.parent_struct, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_timedated_timedate1_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
   paramv = g_new0 (GValue, num_params + 1);
-  g_value_init (&paramv[0], TYPE_TIMEDATE1);
+  g_value_init (&paramv[0], TIMEDATED_TYPE_TIMEDATE1);
   g_value_set_object (&paramv[0], proxy);
   g_variant_iter_init (&iter, parameters);
   n = 1;
@@ -1369,7 +1649,7 @@ timedate1_proxy_g_signal (GDBusProxy *proxy,
         g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
       g_variant_unref (child);
     }
-  signal_id = g_signal_lookup (info->signal_name, TYPE_TIMEDATE1);
+  signal_id = g_signal_lookup (info->signal_name, TIMEDATED_TYPE_TIMEDATE1);
   g_signal_emitv (paramv, signal_id, 0, NULL);
   for (n = 0; n < num_params + 1; n++)
     g_value_unset (&paramv[n]);
@@ -1377,11 +1657,11 @@ timedate1_proxy_g_signal (GDBusProxy *proxy,
 }
 
 static void
-timedate1_proxy_g_properties_changed (GDBusProxy *_proxy,
+timedated_timedate1_proxy_g_properties_changed (GDBusProxy *_proxy,
   GVariant *changed_properties,
   const gchar *const *invalidated_properties)
 {
-  Timedate1Proxy *proxy = TIMEDATE1_PROXY (_proxy);
+  timedatedTimedate1Proxy *proxy = TIMEDATED_TIMEDATE1_PROXY (_proxy);
   guint n;
   const gchar *key;
   GVariantIter *iter;
@@ -1389,7 +1669,7 @@ timedate1_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_timedate1_interface_info.parent_struct, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_timedated_timedate1_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -1397,7 +1677,7 @@ timedate1_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_timedate1_interface_info.parent_struct, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_timedated_timedate1_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -1405,9 +1685,9 @@ timedate1_proxy_g_properties_changed (GDBusProxy *_proxy,
 }
 
 static const gchar *
-timedate1_proxy_get_timezone (Timedate1 *object)
+timedated_timedate1_proxy_get_timezone (timedatedTimedate1 *object)
 {
-  Timedate1Proxy *proxy = TIMEDATE1_PROXY (object);
+  timedatedTimedate1Proxy *proxy = TIMEDATED_TIMEDATE1_PROXY (object);
   GVariant *variant;
   const gchar *value = NULL;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Timezone");
@@ -1420,9 +1700,9 @@ timedate1_proxy_get_timezone (Timedate1 *object)
 }
 
 static gboolean 
-timedate1_proxy_get_local_rtc (Timedate1 *object)
+timedated_timedate1_proxy_get_local_rtc (timedatedTimedate1 *object)
 {
-  Timedate1Proxy *proxy = TIMEDATE1_PROXY (object);
+  timedatedTimedate1Proxy *proxy = TIMEDATED_TIMEDATE1_PROXY (object);
   GVariant *variant;
   gboolean value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "LocalRTC");
@@ -1435,9 +1715,24 @@ timedate1_proxy_get_local_rtc (Timedate1 *object)
 }
 
 static gboolean 
-timedate1_proxy_get_ntp (Timedate1 *object)
+timedated_timedate1_proxy_get_can_ntp (timedatedTimedate1 *object)
+{
+  timedatedTimedate1Proxy *proxy = TIMEDATED_TIMEDATE1_PROXY (object);
+  GVariant *variant;
+  gboolean value = 0;
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanNTP");
+  if (variant != NULL)
+    {
+      value = g_variant_get_boolean (variant);
+      g_variant_unref (variant);
+    }
+  return value;
+}
+
+static gboolean 
+timedated_timedate1_proxy_get_ntp (timedatedTimedate1 *object)
 {
-  Timedate1Proxy *proxy = TIMEDATE1_PROXY (object);
+  timedatedTimedate1Proxy *proxy = TIMEDATED_TIMEDATE1_PROXY (object);
   GVariant *variant;
   gboolean value = 0;
   variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "NTP");
@@ -1449,50 +1744,99 @@ timedate1_proxy_get_ntp (Timedate1 *object)
   return value;
 }
 
+static gboolean 
+timedated_timedate1_proxy_get_ntpsynchronized (timedatedTimedate1 *object)
+{
+  timedatedTimedate1Proxy *proxy = TIMEDATED_TIMEDATE1_PROXY (object);
+  GVariant *variant;
+  gboolean value = 0;
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "NTPSynchronized");
+  if (variant != NULL)
+    {
+      value = g_variant_get_boolean (variant);
+      g_variant_unref (variant);
+    }
+  return value;
+}
+
+static guint64 
+timedated_timedate1_proxy_get_time_usec (timedatedTimedate1 *object)
+{
+  timedatedTimedate1Proxy *proxy = TIMEDATED_TIMEDATE1_PROXY (object);
+  GVariant *variant;
+  guint64 value = 0;
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "TimeUSec");
+  if (variant != NULL)
+    {
+      value = g_variant_get_uint64 (variant);
+      g_variant_unref (variant);
+    }
+  return value;
+}
+
+static guint64 
+timedated_timedate1_proxy_get_rtctime_usec (timedatedTimedate1 *object)
+{
+  timedatedTimedate1Proxy *proxy = TIMEDATED_TIMEDATE1_PROXY (object);
+  GVariant *variant;
+  guint64 value = 0;
+  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "RTCTimeUSec");
+  if (variant != NULL)
+    {
+      value = g_variant_get_uint64 (variant);
+      g_variant_unref (variant);
+    }
+  return value;
+}
+
 static void
-timedate1_proxy_init (Timedate1Proxy *proxy)
+timedated_timedate1_proxy_init (timedatedTimedate1Proxy *proxy)
 {
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  proxy->priv = timedate1_proxy_get_instance_private (proxy);
+  proxy->priv = timedated_timedate1_proxy_get_instance_private (proxy);
 #else
-  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TYPE_TIMEDATE1_PROXY, Timedate1ProxyPrivate);
+  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TIMEDATED_TYPE_TIMEDATE1_PROXY, timedatedTimedate1ProxyPrivate);
 #endif
 
-  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), timedate1_interface_info ());
+  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), timedated_timedate1_interface_info ());
 }
 
 static void
-timedate1_proxy_class_init (Timedate1ProxyClass *klass)
+timedated_timedate1_proxy_class_init (timedatedTimedate1ProxyClass *klass)
 {
   GObjectClass *gobject_class;
   GDBusProxyClass *proxy_class;
 
   gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize     = timedate1_proxy_finalize;
-  gobject_class->get_property = timedate1_proxy_get_property;
-  gobject_class->set_property = timedate1_proxy_set_property;
+  gobject_class->finalize     = timedated_timedate1_proxy_finalize;
+  gobject_class->get_property = timedated_timedate1_proxy_get_property;
+  gobject_class->set_property = timedated_timedate1_proxy_set_property;
 
   proxy_class = G_DBUS_PROXY_CLASS (klass);
-  proxy_class->g_signal = timedate1_proxy_g_signal;
-  proxy_class->g_properties_changed = timedate1_proxy_g_properties_changed;
+  proxy_class->g_signal = timedated_timedate1_proxy_g_signal;
+  proxy_class->g_properties_changed = timedated_timedate1_proxy_g_properties_changed;
 
-  timedate1_override_properties (gobject_class, 1);
+  timedated_timedate1_override_properties (gobject_class, 1);
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (Timedate1ProxyPrivate));
+  g_type_class_add_private (klass, sizeof (timedatedTimedate1ProxyPrivate));
 #endif
 }
 
 static void
-timedate1_proxy_iface_init (Timedate1Iface *iface)
+timedated_timedate1_proxy_iface_init (timedatedTimedate1Iface *iface)
 {
-  iface->get_timezone = timedate1_proxy_get_timezone;
-  iface->get_local_rtc = timedate1_proxy_get_local_rtc;
-  iface->get_ntp = timedate1_proxy_get_ntp;
+  iface->get_timezone = timedated_timedate1_proxy_get_timezone;
+  iface->get_local_rtc = timedated_timedate1_proxy_get_local_rtc;
+  iface->get_can_ntp = timedated_timedate1_proxy_get_can_ntp;
+  iface->get_ntp = timedated_timedate1_proxy_get_ntp;
+  iface->get_ntpsynchronized = timedated_timedate1_proxy_get_ntpsynchronized;
+  iface->get_time_usec = timedated_timedate1_proxy_get_time_usec;
+  iface->get_rtctime_usec = timedated_timedate1_proxy_get_rtctime_usec;
 }
 
 /**
- * timedate1_proxy_new:
+ * timedated_timedate1_proxy_new:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
@@ -1504,12 +1848,12 @@ timedate1_proxy_iface_init (Timedate1Iface *iface)
  * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-timedate1.top_of_page">org.freedesktop.timedate1</link>. See g_dbus_proxy_new() for more details.
  *
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call timedate1_proxy_new_finish() to get the result of the operation.
+ * You can then call timedated_timedate1_proxy_new_finish() to get the result of the operation.
  *
- * See timedate1_proxy_new_sync() for the synchronous, blocking version of this constructor.
+ * See timedated_timedate1_proxy_new_sync() for the synchronous, blocking version of this constructor.
  */
 void
-timedate1_proxy_new (
+timedated_timedate1_proxy_new (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1518,20 +1862,20 @@ timedate1_proxy_new (
     GAsyncReadyCallback  callback,
     gpointer             user_data)
 {
-  g_async_initable_new_async (TYPE_TIMEDATE1_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.timedate1", NULL);
+  g_async_initable_new_async (TIMEDATED_TYPE_TIMEDATE1_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.timedate1", NULL);
 }
 
 /**
- * timedate1_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedate1_proxy_new().
+ * timedated_timedate1_proxy_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedated_timedate1_proxy_new().
  * @error: Return location for error or %NULL
  *
- * Finishes an operation started with timedate1_proxy_new().
+ * Finishes an operation started with timedated_timedate1_proxy_new().
  *
- * Returns: (transfer full) (type Timedate1Proxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type timedatedTimedate1Proxy): The constructed proxy object or %NULL if @error is set.
  */
-Timedate1 *
-timedate1_proxy_new_finish (
+timedatedTimedate1 *
+timedated_timedate1_proxy_new_finish (
     GAsyncResult        *res,
     GError             **error)
 {
@@ -1541,13 +1885,13 @@ timedate1_proxy_new_finish (
   ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
   g_object_unref (source_object);
   if (ret != NULL)
-    return TIMEDATE1 (ret);
+    return TIMEDATED_TIMEDATE1 (ret);
   else
     return NULL;
 }
 
 /**
- * timedate1_proxy_new_sync:
+ * timedated_timedate1_proxy_new_sync:
  * @connection: A #GDBusConnection.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
@@ -1559,12 +1903,12 @@ timedate1_proxy_new_finish (
  *
  * The calling thread is blocked until a reply is received.
  *
- * See timedate1_proxy_new() for the asynchronous version of this constructor.
+ * See timedated_timedate1_proxy_new() for the asynchronous version of this constructor.
  *
- * Returns: (transfer full) (type Timedate1Proxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type timedatedTimedate1Proxy): The constructed proxy object or %NULL if @error is set.
  */
-Timedate1 *
-timedate1_proxy_new_sync (
+timedatedTimedate1 *
+timedated_timedate1_proxy_new_sync (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1573,16 +1917,16 @@ timedate1_proxy_new_sync (
     GError             **error)
 {
   GInitable *ret;
-  ret = g_initable_new (TYPE_TIMEDATE1_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.timedate1", NULL);
+  ret = g_initable_new (TIMEDATED_TYPE_TIMEDATE1_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.timedate1", NULL);
   if (ret != NULL)
-    return TIMEDATE1 (ret);
+    return TIMEDATED_TIMEDATE1 (ret);
   else
     return NULL;
 }
 
 
 /**
- * timedate1_proxy_new_for_bus:
+ * timedated_timedate1_proxy_new_for_bus:
  * @bus_type: A #GBusType.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: A bus name (well-known or unique).
@@ -1591,15 +1935,15 @@ timedate1_proxy_new_sync (
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
  * @user_data: User data to pass to @callback.
  *
- * Like timedate1_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
+ * Like timedated_timedate1_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
  *
  * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call timedate1_proxy_new_for_bus_finish() to get the result of the operation.
+ * You can then call timedated_timedate1_proxy_new_for_bus_finish() to get the result of the operation.
  *
- * See timedate1_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
+ * See timedated_timedate1_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
  */
 void
-timedate1_proxy_new_for_bus (
+timedated_timedate1_proxy_new_for_bus (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1608,20 +1952,20 @@ timedate1_proxy_new_for_bus (
     GAsyncReadyCallback  callback,
     gpointer             user_data)
 {
-  g_async_initable_new_async (TYPE_TIMEDATE1_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.timedate1", NULL);
+  g_async_initable_new_async (TIMEDATED_TYPE_TIMEDATE1_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.timedate1", NULL);
 }
 
 /**
- * timedate1_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedate1_proxy_new_for_bus().
+ * timedated_timedate1_proxy_new_for_bus_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedated_timedate1_proxy_new_for_bus().
  * @error: Return location for error or %NULL
  *
- * Finishes an operation started with timedate1_proxy_new_for_bus().
+ * Finishes an operation started with timedated_timedate1_proxy_new_for_bus().
  *
- * Returns: (transfer full) (type Timedate1Proxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type timedatedTimedate1Proxy): The constructed proxy object or %NULL if @error is set.
  */
-Timedate1 *
-timedate1_proxy_new_for_bus_finish (
+timedatedTimedate1 *
+timedated_timedate1_proxy_new_for_bus_finish (
     GAsyncResult        *res,
     GError             **error)
 {
@@ -1631,13 +1975,13 @@ timedate1_proxy_new_for_bus_finish (
   ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
   g_object_unref (source_object);
   if (ret != NULL)
-    return TIMEDATE1 (ret);
+    return TIMEDATED_TIMEDATE1 (ret);
   else
     return NULL;
 }
 
 /**
- * timedate1_proxy_new_for_bus_sync:
+ * timedated_timedate1_proxy_new_for_bus_sync:
  * @bus_type: A #GBusType.
  * @flags: Flags from the #GDBusProxyFlags enumeration.
  * @name: A bus name (well-known or unique).
@@ -1645,16 +1989,16 @@ timedate1_proxy_new_for_bus_finish (
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL
  *
- * Like timedate1_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
+ * Like timedated_timedate1_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
  *
  * The calling thread is blocked until a reply is received.
  *
- * See timedate1_proxy_new_for_bus() for the asynchronous version of this constructor.
+ * See timedated_timedate1_proxy_new_for_bus() for the asynchronous version of this constructor.
  *
- * Returns: (transfer full) (type Timedate1Proxy): The constructed proxy object or %NULL if @error is set.
+ * Returns: (transfer full) (type timedatedTimedate1Proxy): The constructed proxy object or %NULL if @error is set.
  */
-Timedate1 *
-timedate1_proxy_new_for_bus_sync (
+timedatedTimedate1 *
+timedated_timedate1_proxy_new_for_bus_sync (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -1663,9 +2007,9 @@ timedate1_proxy_new_for_bus_sync (
     GError             **error)
 {
   GInitable *ret;
-  ret = g_initable_new (TYPE_TIMEDATE1_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.timedate1", NULL);
+  ret = g_initable_new (TIMEDATED_TYPE_TIMEDATE1_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.timedate1", NULL);
   if (ret != NULL)
-    return TIMEDATE1 (ret);
+    return TIMEDATED_TIMEDATE1 (ret);
   else
     return NULL;
 }
@@ -1674,19 +2018,19 @@ timedate1_proxy_new_for_bus_sync (
 /* ------------------------------------------------------------------------ */
 
 /**
- * Timedate1Skeleton:
+ * timedatedTimedate1Skeleton:
  *
- * The #Timedate1Skeleton structure contains only private data and should only be accessed using the provided API.
+ * The #timedatedTimedate1Skeleton structure contains only private data and should only be accessed using the provided API.
  */
 
 /**
- * Timedate1SkeletonClass:
+ * timedatedTimedate1SkeletonClass:
  * @parent_class: The parent class.
  *
- * Class structure for #Timedate1Skeleton.
+ * Class structure for #timedatedTimedate1Skeleton.
  */
 
-struct _Timedate1SkeletonPrivate
+struct _timedatedTimedate1SkeletonPrivate
 {
   GValue *properties;
   GList *changed_properties;
@@ -1696,7 +2040,7 @@ struct _Timedate1SkeletonPrivate
 };
 
 static void
-_timedate1_skeleton_handle_method_call (
+_timedated_timedate1_skeleton_handle_method_call (
   GDBusConnection *connection G_GNUC_UNUSED,
   const gchar *sender G_GNUC_UNUSED,
   const gchar *object_path G_GNUC_UNUSED,
@@ -1706,7 +2050,7 @@ _timedate1_skeleton_handle_method_call (
   GDBusMethodInvocation *invocation,
   gpointer user_data)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (user_data);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (user_data);
   _ExtendedGDBusMethodInfo *info;
   GVariantIter iter;
   GVariant *child;
@@ -1721,7 +2065,7 @@ _timedate1_skeleton_handle_method_call (
   num_params = g_variant_n_children (parameters);
   num_extra = info->pass_fdlist ? 3 : 2;  paramv = g_new0 (GValue, num_params + num_extra);
   n = 0;
-  g_value_init (&paramv[n], TYPE_TIMEDATE1);
+  g_value_init (&paramv[n], TIMEDATED_TYPE_TIMEDATE1);
   g_value_set_object (&paramv[n++], skeleton);
   g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
   g_value_set_object (&paramv[n++], invocation);
@@ -1748,7 +2092,7 @@ _timedate1_skeleton_handle_method_call (
         g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
       g_variant_unref (child);
     }
-  signal_id = g_signal_lookup (info->signal_name, TYPE_TIMEDATE1);
+  signal_id = g_signal_lookup (info->signal_name, TIMEDATED_TYPE_TIMEDATE1);
   g_value_init (&return_value, G_TYPE_BOOLEAN);
   g_signal_emitv (paramv, signal_id, 0, &return_value);
   if (!g_value_get_boolean (&return_value))
@@ -1760,7 +2104,7 @@ _timedate1_skeleton_handle_method_call (
 }
 
 static GVariant *
-_timedate1_skeleton_handle_get_property (
+_timedated_timedate1_skeleton_handle_get_property (
   GDBusConnection *connection G_GNUC_UNUSED,
   const gchar *sender G_GNUC_UNUSED,
   const gchar *object_path G_GNUC_UNUSED,
@@ -1769,13 +2113,13 @@ _timedate1_skeleton_handle_get_property (
   GError **error,
   gpointer user_data)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (user_data);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (user_data);
   GValue value = G_VALUE_INIT;
   GParamSpec *pspec;
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_timedate1_interface_info.parent_struct, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_timedated_timedate1_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -1793,7 +2137,7 @@ _timedate1_skeleton_handle_get_property (
 }
 
 static gboolean
-_timedate1_skeleton_handle_set_property (
+_timedated_timedate1_skeleton_handle_set_property (
   GDBusConnection *connection G_GNUC_UNUSED,
   const gchar *sender G_GNUC_UNUSED,
   const gchar *object_path G_GNUC_UNUSED,
@@ -1803,13 +2147,13 @@ _timedate1_skeleton_handle_set_property (
   GError **error,
   gpointer user_data)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (user_data);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (user_data);
   GValue value = G_VALUE_INIT;
   GParamSpec *pspec;
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_timedate1_interface_info.parent_struct, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_timedated_timedate1_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -1829,43 +2173,43 @@ _timedate1_skeleton_handle_set_property (
   return ret;
 }
 
-static const GDBusInterfaceVTable _timedate1_skeleton_vtable =
+static const GDBusInterfaceVTable _timedated_timedate1_skeleton_vtable =
 {
-  _timedate1_skeleton_handle_method_call,
-  _timedate1_skeleton_handle_get_property,
-  _timedate1_skeleton_handle_set_property,
+  _timedated_timedate1_skeleton_handle_method_call,
+  _timedated_timedate1_skeleton_handle_get_property,
+  _timedated_timedate1_skeleton_handle_set_property,
   {NULL}
 };
 
 static GDBusInterfaceInfo *
-timedate1_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
+timedated_timedate1_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
 {
-  return timedate1_interface_info ();
+  return timedated_timedate1_interface_info ();
 }
 
 static GDBusInterfaceVTable *
-timedate1_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
+timedated_timedate1_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
 {
-  return (GDBusInterfaceVTable *) &_timedate1_skeleton_vtable;
+  return (GDBusInterfaceVTable *) &_timedated_timedate1_skeleton_vtable;
 }
 
 static GVariant *
-timedate1_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
+timedated_timedate1_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (_skeleton);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (_skeleton);
 
   GVariantBuilder builder;
   guint n;
   g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
-  if (_timedate1_interface_info.parent_struct.properties == NULL)
+  if (_timedated_timedate1_interface_info.parent_struct.properties == NULL)
     goto out;
-  for (n = 0; _timedate1_interface_info.parent_struct.properties[n] != NULL; n++)
+  for (n = 0; _timedated_timedate1_interface_info.parent_struct.properties[n] != NULL; n++)
     {
-      GDBusPropertyInfo *info = _timedate1_interface_info.parent_struct.properties[n];
+      GDBusPropertyInfo *info = _timedated_timedate1_interface_info.parent_struct.properties[n];
       if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
         {
           GVariant *value;
-          value = _timedate1_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.timedate1", info->name, NULL, skeleton);
+          value = _timedated_timedate1_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.timedate1", info->name, NULL, skeleton);
           if (value != NULL)
             {
               g_variant_take_ref (value);
@@ -1878,12 +2222,12 @@ out:
   return g_variant_builder_end (&builder);
 }
 
-static gboolean _timedate1_emit_changed (gpointer user_data);
+static gboolean _timedated_timedate1_emit_changed (gpointer user_data);
 
 static void
-timedate1_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
+timedated_timedate1_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (_skeleton);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (_skeleton);
   gboolean emit_changed = FALSE;
 
   g_mutex_lock (&skeleton->priv->lock);
@@ -1896,26 +2240,26 @@ timedate1_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
   g_mutex_unlock (&skeleton->priv->lock);
 
   if (emit_changed)
-    _timedate1_emit_changed (skeleton);
+    _timedated_timedate1_emit_changed (skeleton);
 }
 
-static void timedate1_skeleton_iface_init (Timedate1Iface *iface);
+static void timedated_timedate1_skeleton_iface_init (timedatedTimedate1Iface *iface);
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (Timedate1Skeleton, timedate1_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_ADD_PRIVATE (Timedate1Skeleton)
-                         G_IMPLEMENT_INTERFACE (TYPE_TIMEDATE1, timedate1_skeleton_iface_init));
+G_DEFINE_TYPE_WITH_CODE (timedatedTimedate1Skeleton, timedated_timedate1_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+                         G_ADD_PRIVATE (timedatedTimedate1Skeleton)
+                         G_IMPLEMENT_INTERFACE (TIMEDATED_TYPE_TIMEDATE1, timedated_timedate1_skeleton_iface_init));
 
 #else
-G_DEFINE_TYPE_WITH_CODE (Timedate1Skeleton, timedate1_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_IMPLEMENT_INTERFACE (TYPE_TIMEDATE1, timedate1_skeleton_iface_init));
+G_DEFINE_TYPE_WITH_CODE (timedatedTimedate1Skeleton, timedated_timedate1_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+                         G_IMPLEMENT_INTERFACE (TIMEDATED_TYPE_TIMEDATE1, timedated_timedate1_skeleton_iface_init));
 
 #endif
 static void
-timedate1_skeleton_finalize (GObject *object)
+timedated_timedate1_skeleton_finalize (GObject *object)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (object);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
   guint n;
-  for (n = 0; n < 3; n++)
+  for (n = 0; n < 7; n++)
     g_value_unset (&skeleton->priv->properties[n]);
   g_free (skeleton->priv->properties);
   g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
@@ -1923,26 +2267,26 @@ timedate1_skeleton_finalize (GObject *object)
     g_source_destroy (skeleton->priv->changed_properties_idle_source);
   g_main_context_unref (skeleton->priv->context);
   g_mutex_clear (&skeleton->priv->lock);
-  G_OBJECT_CLASS (timedate1_skeleton_parent_class)->finalize (object);
+  G_OBJECT_CLASS (timedated_timedate1_skeleton_parent_class)->finalize (object);
 }
 
 static void
-timedate1_skeleton_get_property (GObject      *object,
+timedated_timedate1_skeleton_get_property (GObject      *object,
   guint         prop_id,
   GValue       *value,
   GParamSpec   *pspec G_GNUC_UNUSED)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (object);
-  g_assert (prop_id != 0 && prop_id - 1 < 3);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
+  g_assert (prop_id != 0 && prop_id - 1 < 7);
   g_mutex_lock (&skeleton->priv->lock);
   g_value_copy (&skeleton->priv->properties[prop_id - 1], value);
   g_mutex_unlock (&skeleton->priv->lock);
 }
 
 static gboolean
-_timedate1_emit_changed (gpointer user_data)
+_timedated_timedate1_emit_changed (gpointer user_data)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (user_data);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (user_data);
   GList *l;
   GVariantBuilder builder;
   GVariantBuilder invalidated_builder;
@@ -2000,7 +2344,7 @@ _timedate1_emit_changed (gpointer user_data)
 }
 
 static void
-_timedate1_schedule_emit_changed (Timedate1Skeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
+_timedated_timedate1_schedule_emit_changed (timedatedTimedate1Skeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
 {
   ChangedProperty *cp;
   GList *l;
@@ -2026,17 +2370,17 @@ _timedate1_schedule_emit_changed (Timedate1Skeleton *skeleton, const _ExtendedGD
 }
 
 static void
-timedate1_skeleton_notify (GObject      *object,
+timedated_timedate1_skeleton_notify (GObject      *object,
   GParamSpec *pspec G_GNUC_UNUSED)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (object);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
   g_mutex_lock (&skeleton->priv->lock);
   if (skeleton->priv->changed_properties != NULL &&
       skeleton->priv->changed_properties_idle_source == NULL)
     {
       skeleton->priv->changed_properties_idle_source = g_idle_source_new ();
       g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);
-      g_source_set_callback (skeleton->priv->changed_properties_idle_source, _timedate1_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
+      g_source_set_callback (skeleton->priv->changed_properties_idle_source, _timedated_timedate1_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
       g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);
       g_source_unref (skeleton->priv->changed_properties_idle_source);
     }
@@ -2044,19 +2388,19 @@ timedate1_skeleton_notify (GObject      *object,
 }
 
 static void
-timedate1_skeleton_set_property (GObject      *object,
+timedated_timedate1_skeleton_set_property (GObject      *object,
   guint         prop_id,
   const GValue *value,
   GParamSpec   *pspec)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (object);
-  g_assert (prop_id != 0 && prop_id - 1 < 3);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
+  g_assert (prop_id != 0 && prop_id - 1 < 7);
   g_mutex_lock (&skeleton->priv->lock);
   g_object_freeze_notify (object);
   if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1]))
     {
       if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)
-        _timedate1_schedule_emit_changed (skeleton, _timedate1_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]);
+        _timedated_timedate1_schedule_emit_changed (skeleton, _timedated_timedate1_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]);
       g_value_copy (value, &skeleton->priv->properties[prop_id - 1]);
       g_object_notify_by_pspec (object, pspec);
     }
@@ -2065,26 +2409,30 @@ timedate1_skeleton_set_property (GObject      *object,
 }
 
 static void
-timedate1_skeleton_init (Timedate1Skeleton *skeleton)
+timedated_timedate1_skeleton_init (timedatedTimedate1Skeleton *skeleton)
 {
 #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  skeleton->priv = timedate1_skeleton_get_instance_private (skeleton);
+  skeleton->priv = timedated_timedate1_skeleton_get_instance_private (skeleton);
 #else
-  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TYPE_TIMEDATE1_SKELETON, Timedate1SkeletonPrivate);
+  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TIMEDATED_TYPE_TIMEDATE1_SKELETON, timedatedTimedate1SkeletonPrivate);
 #endif
 
   g_mutex_init (&skeleton->priv->lock);
   skeleton->priv->context = g_main_context_ref_thread_default ();
-  skeleton->priv->properties = g_new0 (GValue, 3);
+  skeleton->priv->properties = g_new0 (GValue, 7);
   g_value_init (&skeleton->priv->properties[0], G_TYPE_STRING);
   g_value_init (&skeleton->priv->properties[1], G_TYPE_BOOLEAN);
   g_value_init (&skeleton->priv->properties[2], G_TYPE_BOOLEAN);
+  g_value_init (&skeleton->priv->properties[3], G_TYPE_BOOLEAN);
+  g_value_init (&skeleton->priv->properties[4], G_TYPE_BOOLEAN);
+  g_value_init (&skeleton->priv->properties[5], G_TYPE_UINT64);
+  g_value_init (&skeleton->priv->properties[6], G_TYPE_UINT64);
 }
 
 static const gchar *
-timedate1_skeleton_get_timezone (Timedate1 *object)
+timedated_timedate1_skeleton_get_timezone (timedatedTimedate1 *object)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (object);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
   const gchar *value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_string (&(skeleton->priv->properties[0]));
@@ -2093,9 +2441,9 @@ timedate1_skeleton_get_timezone (Timedate1 *object)
 }
 
 static gboolean 
-timedate1_skeleton_get_local_rtc (Timedate1 *object)
+timedated_timedate1_skeleton_get_local_rtc (timedatedTimedate1 *object)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (object);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
   gboolean value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_boolean (&(skeleton->priv->properties[1]));
@@ -2104,9 +2452,9 @@ timedate1_skeleton_get_local_rtc (Timedate1 *object)
 }
 
 static gboolean 
-timedate1_skeleton_get_ntp (Timedate1 *object)
+timedated_timedate1_skeleton_get_can_ntp (timedatedTimedate1 *object)
 {
-  Timedate1Skeleton *skeleton = TIMEDATE1_SKELETON (object);
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
   gboolean value;
   g_mutex_lock (&skeleton->priv->lock);
   value = g_value_get_boolean (&(skeleton->priv->properties[2]));
@@ -2114,50 +2462,662 @@ timedate1_skeleton_get_ntp (Timedate1 *object)
   return value;
 }
 
+static gboolean 
+timedated_timedate1_skeleton_get_ntp (timedatedTimedate1 *object)
+{
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
+  gboolean value;
+  g_mutex_lock (&skeleton->priv->lock);
+  value = g_value_get_boolean (&(skeleton->priv->properties[3]));
+  g_mutex_unlock (&skeleton->priv->lock);
+  return value;
+}
+
+static gboolean 
+timedated_timedate1_skeleton_get_ntpsynchronized (timedatedTimedate1 *object)
+{
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
+  gboolean value;
+  g_mutex_lock (&skeleton->priv->lock);
+  value = g_value_get_boolean (&(skeleton->priv->properties[4]));
+  g_mutex_unlock (&skeleton->priv->lock);
+  return value;
+}
+
+static guint64 
+timedated_timedate1_skeleton_get_time_usec (timedatedTimedate1 *object)
+{
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
+  guint64 value;
+  g_mutex_lock (&skeleton->priv->lock);
+  value = g_value_get_uint64 (&(skeleton->priv->properties[5]));
+  g_mutex_unlock (&skeleton->priv->lock);
+  return value;
+}
+
+static guint64 
+timedated_timedate1_skeleton_get_rtctime_usec (timedatedTimedate1 *object)
+{
+  timedatedTimedate1Skeleton *skeleton = TIMEDATED_TIMEDATE1_SKELETON (object);
+  guint64 value;
+  g_mutex_lock (&skeleton->priv->lock);
+  value = g_value_get_uint64 (&(skeleton->priv->properties[6]));
+  g_mutex_unlock (&skeleton->priv->lock);
+  return value;
+}
+
 static void
-timedate1_skeleton_class_init (Timedate1SkeletonClass *klass)
+timedated_timedate1_skeleton_class_init (timedatedTimedate1SkeletonClass *klass)
 {
   GObjectClass *gobject_class;
   GDBusInterfaceSkeletonClass *skeleton_class;
 
   gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = timedate1_skeleton_finalize;
-  gobject_class->get_property = timedate1_skeleton_get_property;
-  gobject_class->set_property = timedate1_skeleton_set_property;
-  gobject_class->notify       = timedate1_skeleton_notify;
+  gobject_class->finalize = timedated_timedate1_skeleton_finalize;
+  gobject_class->get_property = timedated_timedate1_skeleton_get_property;
+  gobject_class->set_property = timedated_timedate1_skeleton_set_property;
+  gobject_class->notify       = timedated_timedate1_skeleton_notify;
 
 
-  timedate1_override_properties (gobject_class, 1);
+  timedated_timedate1_override_properties (gobject_class, 1);
 
   skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
-  skeleton_class->get_info = timedate1_skeleton_dbus_interface_get_info;
-  skeleton_class->get_properties = timedate1_skeleton_dbus_interface_get_properties;
-  skeleton_class->flush = timedate1_skeleton_dbus_interface_flush;
-  skeleton_class->get_vtable = timedate1_skeleton_dbus_interface_get_vtable;
+  skeleton_class->get_info = timedated_timedate1_skeleton_dbus_interface_get_info;
+  skeleton_class->get_properties = timedated_timedate1_skeleton_dbus_interface_get_properties;
+  skeleton_class->flush = timedated_timedate1_skeleton_dbus_interface_flush;
+  skeleton_class->get_vtable = timedated_timedate1_skeleton_dbus_interface_get_vtable;
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (Timedate1SkeletonPrivate));
+  g_type_class_add_private (klass, sizeof (timedatedTimedate1SkeletonPrivate));
 #endif
 }
 
 static void
-timedate1_skeleton_iface_init (Timedate1Iface *iface)
+timedated_timedate1_skeleton_iface_init (timedatedTimedate1Iface *iface)
 {
-  iface->get_timezone = timedate1_skeleton_get_timezone;
-  iface->get_local_rtc = timedate1_skeleton_get_local_rtc;
-  iface->get_ntp = timedate1_skeleton_get_ntp;
+  iface->get_timezone = timedated_timedate1_skeleton_get_timezone;
+  iface->get_local_rtc = timedated_timedate1_skeleton_get_local_rtc;
+  iface->get_can_ntp = timedated_timedate1_skeleton_get_can_ntp;
+  iface->get_ntp = timedated_timedate1_skeleton_get_ntp;
+  iface->get_ntpsynchronized = timedated_timedate1_skeleton_get_ntpsynchronized;
+  iface->get_time_usec = timedated_timedate1_skeleton_get_time_usec;
+  iface->get_rtctime_usec = timedated_timedate1_skeleton_get_rtctime_usec;
 }
 
 /**
- * timedate1_skeleton_new:
+ * timedated_timedate1_skeleton_new:
  *
  * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-timedate1.top_of_page">org.freedesktop.timedate1</link>.
  *
- * Returns: (transfer full) (type Timedate1Skeleton): The skeleton object.
+ * Returns: (transfer full) (type timedatedTimedate1Skeleton): The skeleton object.
+ */
+timedatedTimedate1 *
+timedated_timedate1_skeleton_new (void)
+{
+  return TIMEDATED_TIMEDATE1 (g_object_new (TIMEDATED_TYPE_TIMEDATE1_SKELETON, NULL));
+}
+
+/* ------------------------------------------------------------------------
+ * Code for Object, ObjectProxy and ObjectSkeleton
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * SECTION:timedatedObject
+ * @title: timedatedObject
+ * @short_description: Specialized GDBusObject types
+ *
+ * This section contains the #timedatedObject, #timedatedObjectProxy, and #timedatedObjectSkeleton types which make it easier to work with objects implementing generated types for D-Bus interfaces.
+ */
+
+/**
+ * timedatedObject:
+ *
+ * The #timedatedObject type is a specialized container of interfaces.
+ */
+
+/**
+ * timedatedObjectIface:
+ * @parent_iface: The parent interface.
+ *
+ * Virtual table for the #timedatedObject interface.
+ */
+
+typedef timedatedObjectIface timedatedObjectInterface;
+G_DEFINE_INTERFACE_WITH_CODE (timedatedObject, timedated_object, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));
+
+static void
+timedated_object_default_init (timedatedObjectIface *iface)
+{
+  /**
+   * timedatedObject:timedate1:
+   *
+   * The #timedatedTimedate1 instance corresponding to the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-timedate1.top_of_page">org.freedesktop.timedate1</link>, if any.
+   *
+   * Connect to the #GObject::notify signal to get informed of property changes.
+   */
+  g_object_interface_install_property (iface, g_param_spec_object ("timedate1", "timedate1", "timedate1", TIMEDATED_TYPE_TIMEDATE1, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));
+
+}
+
+/**
+ * timedated_object_get_timedate1:
+ * @object: A #timedatedObject.
+ *
+ * Gets the #timedatedTimedate1 instance for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-timedate1.top_of_page">org.freedesktop.timedate1</link> on @object, if any.
+ *
+ * Returns: (transfer full): A #timedatedTimedate1 that must be freed with g_object_unref() or %NULL if @object does not implement the interface.
+ */
+timedatedTimedate1 *timedated_object_get_timedate1 (timedatedObject *object)
+{
+  GDBusInterface *ret;
+  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.timedate1");
+  if (ret == NULL)
+    return NULL;
+  return TIMEDATED_TIMEDATE1 (ret);
+}
+
+
+/**
+ * timedated_object_peek_timedate1: (skip)
+ * @object: A #timedatedObject.
+ *
+ * Like timedated_object_get_timedate1() but doesn't increase the reference count on the returned object.
+ *
+ * <warning>It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running.</warning>
+ *
+ * Returns: (transfer none): A #timedatedTimedate1 or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object.
+ */
+timedatedTimedate1 *timedated_object_peek_timedate1 (timedatedObject *object)
+{
+  GDBusInterface *ret;
+  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.timedate1");
+  if (ret == NULL)
+    return NULL;
+  g_object_unref (ret);
+  return TIMEDATED_TIMEDATE1 (ret);
+}
+
+
+static void
+timedated_object_notify (GDBusObject *object, GDBusInterface *interface)
+{
+  _ExtendedGDBusInterfaceInfo *info = (_ExtendedGDBusInterfaceInfo *) g_dbus_interface_get_info (interface);
+  /* info can be NULL if the other end is using a D-Bus interface we don't know
+   * anything about, for example old generated code in this process talking to
+   * newer generated code in the other process. */
+  if (info != NULL)
+    g_object_notify (G_OBJECT (object), info->hyphen_name);
+}
+
+/**
+ * timedatedObjectProxy:
+ *
+ * The #timedatedObjectProxy structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * timedatedObjectProxyClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #timedatedObjectProxy.
+ */
+
+static void
+timedated_object_proxy__timedated_object_iface_init (timedatedObjectIface *iface G_GNUC_UNUSED)
+{
+}
+
+static void
+timedated_object_proxy__g_dbus_object_iface_init (GDBusObjectIface *iface)
+{
+  iface->interface_added = timedated_object_notify;
+  iface->interface_removed = timedated_object_notify;
+}
+
+
+G_DEFINE_TYPE_WITH_CODE (timedatedObjectProxy, timedated_object_proxy, G_TYPE_DBUS_OBJECT_PROXY,
+                         G_IMPLEMENT_INTERFACE (TIMEDATED_TYPE_OBJECT, timedated_object_proxy__timedated_object_iface_init)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, timedated_object_proxy__g_dbus_object_iface_init));
+
+static void
+timedated_object_proxy_init (timedatedObjectProxy *object G_GNUC_UNUSED)
+{
+}
+
+static void
+timedated_object_proxy_set_property (GObject      *gobject,
+  guint         prop_id,
+  const GValue *value G_GNUC_UNUSED,
+  GParamSpec   *pspec)
+{
+  G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+}
+
+static void
+timedated_object_proxy_get_property (GObject      *gobject,
+  guint         prop_id,
+  GValue       *value,
+  GParamSpec   *pspec)
+{
+  timedatedObjectProxy *object = TIMEDATED_OBJECT_PROXY (gobject);
+  GDBusInterface *interface;
+
+  switch (prop_id)
+    {
+    case 1:
+      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.timedate1");
+      g_value_take_object (value, interface);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+timedated_object_proxy_class_init (timedatedObjectProxyClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = timedated_object_proxy_set_property;
+  gobject_class->get_property = timedated_object_proxy_get_property;
+
+  g_object_class_override_property (gobject_class, 1, "timedate1");
+}
+
+/**
+ * timedated_object_proxy_new:
+ * @connection: A #GDBusConnection.
+ * @object_path: An object path.
+ *
+ * Creates a new proxy object.
+ *
+ * Returns: (transfer full): The proxy object.
+ */
+timedatedObjectProxy *
+timedated_object_proxy_new (GDBusConnection *connection,
+  const gchar *object_path)
+{
+  g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
+  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
+  return TIMEDATED_OBJECT_PROXY (g_object_new (TIMEDATED_TYPE_OBJECT_PROXY, "g-connection", connection, "g-object-path", object_path, NULL));
+}
+
+/**
+ * timedatedObjectSkeleton:
+ *
+ * The #timedatedObjectSkeleton structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * timedatedObjectSkeletonClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #timedatedObjectSkeleton.
+ */
+
+static void
+timedated_object_skeleton__timedated_object_iface_init (timedatedObjectIface *iface G_GNUC_UNUSED)
+{
+}
+
+
+static void
+timedated_object_skeleton__g_dbus_object_iface_init (GDBusObjectIface *iface)
+{
+  iface->interface_added = timedated_object_notify;
+  iface->interface_removed = timedated_object_notify;
+}
+
+G_DEFINE_TYPE_WITH_CODE (timedatedObjectSkeleton, timedated_object_skeleton, G_TYPE_DBUS_OBJECT_SKELETON,
+                         G_IMPLEMENT_INTERFACE (TIMEDATED_TYPE_OBJECT, timedated_object_skeleton__timedated_object_iface_init)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, timedated_object_skeleton__g_dbus_object_iface_init));
+
+static void
+timedated_object_skeleton_init (timedatedObjectSkeleton *object G_GNUC_UNUSED)
+{
+}
+
+static void
+timedated_object_skeleton_set_property (GObject      *gobject,
+  guint         prop_id,
+  const GValue *value,
+  GParamSpec   *pspec)
+{
+  timedatedObjectSkeleton *object = TIMEDATED_OBJECT_SKELETON (gobject);
+  GDBusInterfaceSkeleton *interface;
+
+  switch (prop_id)
+    {
+    case 1:
+      interface = g_value_get_object (value);
+      if (interface != NULL)
+        {
+          g_warn_if_fail (TIMEDATED_IS_TIMEDATE1 (interface));
+          g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (object), interface);
+        }
+      else
+        {
+          g_dbus_object_skeleton_remove_interface_by_name (G_DBUS_OBJECT_SKELETON (object), "org.freedesktop.timedate1");
+        }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+timedated_object_skeleton_get_property (GObject      *gobject,
+  guint         prop_id,
+  GValue       *value,
+  GParamSpec   *pspec)
+{
+  timedatedObjectSkeleton *object = TIMEDATED_OBJECT_SKELETON (gobject);
+  GDBusInterface *interface;
+
+  switch (prop_id)
+    {
+    case 1:
+      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.timedate1");
+      g_value_take_object (value, interface);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+timedated_object_skeleton_class_init (timedatedObjectSkeletonClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = timedated_object_skeleton_set_property;
+  gobject_class->get_property = timedated_object_skeleton_get_property;
+
+  g_object_class_override_property (gobject_class, 1, "timedate1");
+}
+
+/**
+ * timedated_object_skeleton_new:
+ * @object_path: An object path.
+ *
+ * Creates a new skeleton object.
+ *
+ * Returns: (transfer full): The skeleton object.
+ */
+timedatedObjectSkeleton *
+timedated_object_skeleton_new (const gchar *object_path)
+{
+  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
+  return TIMEDATED_OBJECT_SKELETON (g_object_new (TIMEDATED_TYPE_OBJECT_SKELETON, "g-object-path", object_path, NULL));
+}
+
+/**
+ * timedated_object_skeleton_set_timedate1:
+ * @object: A #timedatedObjectSkeleton.
+ * @interface_: (allow-none): A #timedatedTimedate1 or %NULL to clear the interface.
+ *
+ * Sets the #timedatedTimedate1 instance for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-timedate1.top_of_page">org.freedesktop.timedate1</link> on @object.
+ */
+void timedated_object_skeleton_set_timedate1 (timedatedObjectSkeleton *object, timedatedTimedate1 *interface_)
+{
+  g_object_set (G_OBJECT (object), "timedate1", interface_, NULL);
+}
+
+
+/* ------------------------------------------------------------------------
+ * Code for ObjectManager client
+ * ------------------------------------------------------------------------
+ */
+
+/**
+ * SECTION:timedatedObjectManagerClient
+ * @title: timedatedObjectManagerClient
+ * @short_description: Generated GDBusObjectManagerClient type
+ *
+ * This section contains a #GDBusObjectManagerClient that uses timedated_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc.
+ */
+
+/**
+ * timedatedObjectManagerClient:
+ *
+ * The #timedatedObjectManagerClient structure contains only private data and should only be accessed using the provided API.
+ */
+
+/**
+ * timedatedObjectManagerClientClass:
+ * @parent_class: The parent class.
+ *
+ * Class structure for #timedatedObjectManagerClient.
+ */
+
+G_DEFINE_TYPE (timedatedObjectManagerClient, timedated_object_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT);
+
+static void
+timedated_object_manager_client_init (timedatedObjectManagerClient *manager G_GNUC_UNUSED)
+{
+}
+
+static void
+timedated_object_manager_client_class_init (timedatedObjectManagerClientClass *klass G_GNUC_UNUSED)
+{
+}
+
+/**
+ * timedated_object_manager_client_get_proxy_type:
+ * @manager: A #GDBusObjectManagerClient.
+ * @object_path: The object path of the remote object (unused).
+ * @interface_name: (allow-none): Interface name of the remote object or %NULL to get the object proxy #GType.
+ * @user_data: User data (unused).
+ *
+ * A #GDBusProxyTypeFunc that maps @interface_name to the generated #GDBusObjectProxy<!-- -->- and #GDBusProxy<!-- -->-derived types.
+ *
+ * Returns: A #GDBusProxy<!-- -->-derived #GType if @interface_name is not %NULL, otherwise the #GType for #timedatedObjectProxy.
+ */
+GType
+timedated_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager G_GNUC_UNUSED, const gchar *object_path G_GNUC_UNUSED, const gchar *interface_name, gpointer user_data G_GNUC_UNUSED)
+{
+  static gsize once_init_value = 0;
+  static GHashTable *lookup_hash;
+  GType ret;
+
+  if (interface_name == NULL)
+    return TIMEDATED_TYPE_OBJECT_PROXY;
+  if (g_once_init_enter (&once_init_value))
+    {
+      lookup_hash = g_hash_table_new (g_str_hash, g_str_equal);
+      g_hash_table_insert (lookup_hash, (gpointer) "org.freedesktop.timedate1", GSIZE_TO_POINTER (TIMEDATED_TYPE_TIMEDATE1_PROXY));
+      g_once_init_leave (&once_init_value, 1);
+    }
+  ret = (GType) GPOINTER_TO_SIZE (g_hash_table_lookup (lookup_hash, interface_name));
+  if (ret == (GType) 0)
+    ret = G_TYPE_DBUS_PROXY;
+  return ret;
+}
+
+/**
+ * timedated_object_manager_client_new:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously creates #GDBusObjectManagerClient using timedated_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new() for more details.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call timedated_object_manager_client_new_finish() to get the result of the operation.
+ *
+ * See timedated_object_manager_client_new_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+timedated_object_manager_client_new (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data)
+{
+  g_async_initable_new_async (TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", timedated_object_manager_client_get_proxy_type, NULL);
+}
+
+/**
+ * timedated_object_manager_client_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedated_object_manager_client_new().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with timedated_object_manager_client_new().
+ *
+ * Returns: (transfer full) (type timedatedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+timedated_object_manager_client_new_finish (
+    GAsyncResult        *res,
+    GError             **error)
+{
+  GObject *ret;
+  GObject *source_object;
+  source_object = g_async_result_get_source_object (res);
+  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+  g_object_unref (source_object);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+/**
+ * timedated_object_manager_client_new_sync:
+ * @connection: A #GDBusConnection.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Synchronously creates #GDBusObjectManagerClient using timedated_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new_sync() for more details.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See timedated_object_manager_client_new() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type timedatedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+timedated_object_manager_client_new_sync (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error)
+{
+  GInitable *ret;
+  ret = g_initable_new (TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", timedated_object_manager_client_get_proxy_type, NULL);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+
+/**
+ * timedated_object_manager_client_new_for_bus:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ * Like timedated_object_manager_client_new() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call timedated_object_manager_client_new_for_bus_finish() to get the result of the operation.
+ *
+ * See timedated_object_manager_client_new_for_bus_sync() for the synchronous, blocking version of this constructor.
+ */
+void
+timedated_object_manager_client_new_for_bus (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data)
+{
+  g_async_initable_new_async (TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", timedated_object_manager_client_get_proxy_type, NULL);
+}
+
+/**
+ * timedated_object_manager_client_new_for_bus_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to timedated_object_manager_client_new_for_bus().
+ * @error: Return location for error or %NULL
+ *
+ * Finishes an operation started with timedated_object_manager_client_new_for_bus().
+ *
+ * Returns: (transfer full) (type timedatedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
  */
-Timedate1 *
-timedate1_skeleton_new (void)
+GDBusObjectManager *
+timedated_object_manager_client_new_for_bus_finish (
+    GAsyncResult        *res,
+    GError             **error)
 {
-  return TIMEDATE1 (g_object_new (TYPE_TIMEDATE1_SKELETON, NULL));
+  GObject *ret;
+  GObject *source_object;
+  source_object = g_async_result_get_source_object (res);
+  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
+  g_object_unref (source_object);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
 }
 
+/**
+ * timedated_object_manager_client_new_for_bus_sync:
+ * @bus_type: A #GBusType.
+ * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
+ * @name: A bus name (well-known or unique).
+ * @object_path: An object path.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL
+ *
+ * Like timedated_object_manager_client_new_sync() but takes a #GBusType instead of a #GDBusConnection.
+ *
+ * The calling thread is blocked until a reply is received.
+ *
+ * See timedated_object_manager_client_new_for_bus() for the asynchronous version of this constructor.
+ *
+ * Returns: (transfer full) (type timedatedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
+ */
+GDBusObjectManager *
+timedated_object_manager_client_new_for_bus_sync (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error)
+{
+  GInitable *ret;
+  ret = g_initable_new (TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", timedated_object_manager_client_get_proxy_type, NULL);
+  if (ret != NULL)
+    return G_DBUS_OBJECT_MANAGER (ret);
+  else
+    return NULL;
+}
+
+
diff --git a/src/interfaces/timedated/timedated-gen.h b/src/interfaces/timedated/timedated-gen.h
index ea5fe7d..757dc43 100644
--- a/src/interfaces/timedated/timedated-gen.h
+++ b/src/interfaces/timedated/timedated-gen.h
@@ -15,206 +15,226 @@ G_BEGIN_DECLS
 /* ------------------------------------------------------------------------ */
 /* Declarations for org.freedesktop.timedate1 */
 
-#define TYPE_TIMEDATE1 (timedate1_get_type ())
-#define TIMEDATE1(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_TIMEDATE1, Timedate1))
-#define IS_TIMEDATE1(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_TIMEDATE1))
-#define TIMEDATE1_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TYPE_TIMEDATE1, Timedate1Iface))
+#define TIMEDATED_TYPE_TIMEDATE1 (timedated_timedate1_get_type ())
+#define TIMEDATED_TIMEDATE1(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TIMEDATED_TYPE_TIMEDATE1, timedatedTimedate1))
+#define TIMEDATED_IS_TIMEDATE1(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TIMEDATED_TYPE_TIMEDATE1))
+#define TIMEDATED_TIMEDATE1_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TIMEDATED_TYPE_TIMEDATE1, timedatedTimedate1Iface))
 
-struct _Timedate1;
-typedef struct _Timedate1 Timedate1;
-typedef struct _Timedate1Iface Timedate1Iface;
+struct _timedatedTimedate1;
+typedef struct _timedatedTimedate1 timedatedTimedate1;
+typedef struct _timedatedTimedate1Iface timedatedTimedate1Iface;
 
-struct _Timedate1Iface
+struct _timedatedTimedate1Iface
 {
   GTypeInterface parent_iface;
 
 
   gboolean (*handle_set_local_rtc) (
-    Timedate1 *object,
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation,
-    gboolean arg_local_rtc,
-    gboolean arg_fix_system,
-    gboolean arg_user_interaction);
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2);
 
   gboolean (*handle_set_ntp) (
-    Timedate1 *object,
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation,
-    gboolean arg_use_ntp,
-    gboolean arg_user_interaction);
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1);
 
   gboolean (*handle_set_time) (
-    Timedate1 *object,
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation,
-    gint64 arg_usec_utc,
-    gboolean arg_relative,
-    gboolean arg_user_interaction);
+    gint64 arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2);
 
   gboolean (*handle_set_timezone) (
-    Timedate1 *object,
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation,
-    const gchar *arg_timezone,
-    gboolean arg_user_interaction);
+    const gchar *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1);
 
-  gboolean  (*get_local_rtc) (Timedate1 *object);
+  gboolean  (*get_can_ntp) (timedatedTimedate1 *object);
 
-  gboolean  (*get_ntp) (Timedate1 *object);
+  gboolean  (*get_local_rtc) (timedatedTimedate1 *object);
 
-  const gchar * (*get_timezone) (Timedate1 *object);
+  gboolean  (*get_ntp) (timedatedTimedate1 *object);
+
+  gboolean  (*get_ntpsynchronized) (timedatedTimedate1 *object);
+
+  guint64  (*get_rtctime_usec) (timedatedTimedate1 *object);
+
+  guint64  (*get_time_usec) (timedatedTimedate1 *object);
+
+  const gchar * (*get_timezone) (timedatedTimedate1 *object);
 
 };
 
-GType timedate1_get_type (void) G_GNUC_CONST;
+GType timedated_timedate1_get_type (void) G_GNUC_CONST;
 
-GDBusInterfaceInfo *timedate1_interface_info (void);
-guint timedate1_override_properties (GObjectClass *klass, guint property_id_begin);
+GDBusInterfaceInfo *timedated_timedate1_interface_info (void);
+guint timedated_timedate1_override_properties (GObjectClass *klass, guint property_id_begin);
 
 
 /* D-Bus method call completion functions: */
-void timedate1_complete_set_time (
-    Timedate1 *object,
+void timedated_timedate1_complete_set_time (
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation);
 
-void timedate1_complete_set_timezone (
-    Timedate1 *object,
+void timedated_timedate1_complete_set_timezone (
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation);
 
-void timedate1_complete_set_local_rtc (
-    Timedate1 *object,
+void timedated_timedate1_complete_set_local_rtc (
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation);
 
-void timedate1_complete_set_ntp (
-    Timedate1 *object,
+void timedated_timedate1_complete_set_ntp (
+    timedatedTimedate1 *object,
     GDBusMethodInvocation *invocation);
 
 
 
 /* D-Bus method calls: */
-void timedate1_call_set_time (
-    Timedate1 *proxy,
-    gint64 arg_usec_utc,
-    gboolean arg_relative,
-    gboolean arg_user_interaction,
+void timedated_timedate1_call_set_time (
+    timedatedTimedate1 *proxy,
+    gint64 arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean timedate1_call_set_time_finish (
-    Timedate1 *proxy,
+gboolean timedated_timedate1_call_set_time_finish (
+    timedatedTimedate1 *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean timedate1_call_set_time_sync (
-    Timedate1 *proxy,
-    gint64 arg_usec_utc,
-    gboolean arg_relative,
-    gboolean arg_user_interaction,
+gboolean timedated_timedate1_call_set_time_sync (
+    timedatedTimedate1 *proxy,
+    gint64 arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GError **error);
 
-void timedate1_call_set_timezone (
-    Timedate1 *proxy,
-    const gchar *arg_timezone,
-    gboolean arg_user_interaction,
+void timedated_timedate1_call_set_timezone (
+    timedatedTimedate1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean timedate1_call_set_timezone_finish (
-    Timedate1 *proxy,
+gboolean timedated_timedate1_call_set_timezone_finish (
+    timedatedTimedate1 *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean timedate1_call_set_timezone_sync (
-    Timedate1 *proxy,
-    const gchar *arg_timezone,
-    gboolean arg_user_interaction,
+gboolean timedated_timedate1_call_set_timezone_sync (
+    timedatedTimedate1 *proxy,
+    const gchar *arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
-void timedate1_call_set_local_rtc (
-    Timedate1 *proxy,
-    gboolean arg_local_rtc,
-    gboolean arg_fix_system,
-    gboolean arg_user_interaction,
+void timedated_timedate1_call_set_local_rtc (
+    timedatedTimedate1 *proxy,
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean timedate1_call_set_local_rtc_finish (
-    Timedate1 *proxy,
+gboolean timedated_timedate1_call_set_local_rtc_finish (
+    timedatedTimedate1 *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean timedate1_call_set_local_rtc_sync (
-    Timedate1 *proxy,
-    gboolean arg_local_rtc,
-    gboolean arg_fix_system,
-    gboolean arg_user_interaction,
+gboolean timedated_timedate1_call_set_local_rtc_sync (
+    timedatedTimedate1 *proxy,
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
+    gboolean arg_unnamed_arg2,
     GCancellable *cancellable,
     GError **error);
 
-void timedate1_call_set_ntp (
-    Timedate1 *proxy,
-    gboolean arg_use_ntp,
-    gboolean arg_user_interaction,
+void timedated_timedate1_call_set_ntp (
+    timedatedTimedate1 *proxy,
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean timedate1_call_set_ntp_finish (
-    Timedate1 *proxy,
+gboolean timedated_timedate1_call_set_ntp_finish (
+    timedatedTimedate1 *proxy,
     GAsyncResult *res,
     GError **error);
 
-gboolean timedate1_call_set_ntp_sync (
-    Timedate1 *proxy,
-    gboolean arg_use_ntp,
-    gboolean arg_user_interaction,
+gboolean timedated_timedate1_call_set_ntp_sync (
+    timedatedTimedate1 *proxy,
+    gboolean arg_unnamed_arg0,
+    gboolean arg_unnamed_arg1,
     GCancellable *cancellable,
     GError **error);
 
 
 
 /* D-Bus property accessors: */
-const gchar *timedate1_get_timezone (Timedate1 *object);
-gchar *timedate1_dup_timezone (Timedate1 *object);
-void timedate1_set_timezone (Timedate1 *object, const gchar *value);
+const gchar *timedated_timedate1_get_timezone (timedatedTimedate1 *object);
+gchar *timedated_timedate1_dup_timezone (timedatedTimedate1 *object);
+void timedated_timedate1_set_timezone (timedatedTimedate1 *object, const gchar *value);
+
+gboolean timedated_timedate1_get_local_rtc (timedatedTimedate1 *object);
+void timedated_timedate1_set_local_rtc (timedatedTimedate1 *object, gboolean value);
+
+gboolean timedated_timedate1_get_can_ntp (timedatedTimedate1 *object);
+void timedated_timedate1_set_can_ntp (timedatedTimedate1 *object, gboolean value);
+
+gboolean timedated_timedate1_get_ntp (timedatedTimedate1 *object);
+void timedated_timedate1_set_ntp (timedatedTimedate1 *object, gboolean value);
+
+gboolean timedated_timedate1_get_ntpsynchronized (timedatedTimedate1 *object);
+void timedated_timedate1_set_ntpsynchronized (timedatedTimedate1 *object, gboolean value);
 
-gboolean timedate1_get_local_rtc (Timedate1 *object);
-void timedate1_set_local_rtc (Timedate1 *object, gboolean value);
+guint64 timedated_timedate1_get_time_usec (timedatedTimedate1 *object);
+void timedated_timedate1_set_time_usec (timedatedTimedate1 *object, guint64 value);
 
-gboolean timedate1_get_ntp (Timedate1 *object);
-void timedate1_set_ntp (Timedate1 *object, gboolean value);
+guint64 timedated_timedate1_get_rtctime_usec (timedatedTimedate1 *object);
+void timedated_timedate1_set_rtctime_usec (timedatedTimedate1 *object, guint64 value);
 
 
 /* ---- */
 
-#define TYPE_TIMEDATE1_PROXY (timedate1_proxy_get_type ())
-#define TIMEDATE1_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_TIMEDATE1_PROXY, Timedate1Proxy))
-#define TIMEDATE1_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_TIMEDATE1_PROXY, Timedate1ProxyClass))
-#define TIMEDATE1_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_TIMEDATE1_PROXY, Timedate1ProxyClass))
-#define IS_TIMEDATE1_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_TIMEDATE1_PROXY))
-#define IS_TIMEDATE1_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_TIMEDATE1_PROXY))
+#define TIMEDATED_TYPE_TIMEDATE1_PROXY (timedated_timedate1_proxy_get_type ())
+#define TIMEDATED_TIMEDATE1_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TIMEDATED_TYPE_TIMEDATE1_PROXY, timedatedTimedate1Proxy))
+#define TIMEDATED_TIMEDATE1_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TIMEDATED_TYPE_TIMEDATE1_PROXY, timedatedTimedate1ProxyClass))
+#define TIMEDATED_TIMEDATE1_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TIMEDATED_TYPE_TIMEDATE1_PROXY, timedatedTimedate1ProxyClass))
+#define TIMEDATED_IS_TIMEDATE1_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TIMEDATED_TYPE_TIMEDATE1_PROXY))
+#define TIMEDATED_IS_TIMEDATE1_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TIMEDATED_TYPE_TIMEDATE1_PROXY))
 
-typedef struct _Timedate1Proxy Timedate1Proxy;
-typedef struct _Timedate1ProxyClass Timedate1ProxyClass;
-typedef struct _Timedate1ProxyPrivate Timedate1ProxyPrivate;
+typedef struct _timedatedTimedate1Proxy timedatedTimedate1Proxy;
+typedef struct _timedatedTimedate1ProxyClass timedatedTimedate1ProxyClass;
+typedef struct _timedatedTimedate1ProxyPrivate timedatedTimedate1ProxyPrivate;
 
-struct _Timedate1Proxy
+struct _timedatedTimedate1Proxy
 {
   /*< private >*/
   GDBusProxy parent_instance;
-  Timedate1ProxyPrivate *priv;
+  timedatedTimedate1ProxyPrivate *priv;
 };
 
-struct _Timedate1ProxyClass
+struct _timedatedTimedate1ProxyClass
 {
   GDBusProxyClass parent_class;
 };
 
-GType timedate1_proxy_get_type (void) G_GNUC_CONST;
+GType timedated_timedate1_proxy_get_type (void) G_GNUC_CONST;
 
-void timedate1_proxy_new (
+void timedated_timedate1_proxy_new (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -222,10 +242,10 @@ void timedate1_proxy_new (
     GCancellable        *cancellable,
     GAsyncReadyCallback  callback,
     gpointer             user_data);
-Timedate1 *timedate1_proxy_new_finish (
+timedatedTimedate1 *timedated_timedate1_proxy_new_finish (
     GAsyncResult        *res,
     GError             **error);
-Timedate1 *timedate1_proxy_new_sync (
+timedatedTimedate1 *timedated_timedate1_proxy_new_sync (
     GDBusConnection     *connection,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -233,7 +253,7 @@ Timedate1 *timedate1_proxy_new_sync (
     GCancellable        *cancellable,
     GError             **error);
 
-void timedate1_proxy_new_for_bus (
+void timedated_timedate1_proxy_new_for_bus (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -241,10 +261,10 @@ void timedate1_proxy_new_for_bus (
     GCancellable        *cancellable,
     GAsyncReadyCallback  callback,
     gpointer             user_data);
-Timedate1 *timedate1_proxy_new_for_bus_finish (
+timedatedTimedate1 *timedated_timedate1_proxy_new_for_bus_finish (
     GAsyncResult        *res,
     GError             **error);
-Timedate1 *timedate1_proxy_new_for_bus_sync (
+timedatedTimedate1 *timedated_timedate1_proxy_new_for_bus_sync (
     GBusType             bus_type,
     GDBusProxyFlags      flags,
     const gchar         *name,
@@ -255,32 +275,174 @@ Timedate1 *timedate1_proxy_new_for_bus_sync (
 
 /* ---- */
 
-#define TYPE_TIMEDATE1_SKELETON (timedate1_skeleton_get_type ())
-#define TIMEDATE1_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_TIMEDATE1_SKELETON, Timedate1Skeleton))
-#define TIMEDATE1_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_TIMEDATE1_SKELETON, Timedate1SkeletonClass))
-#define TIMEDATE1_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_TIMEDATE1_SKELETON, Timedate1SkeletonClass))
-#define IS_TIMEDATE1_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_TIMEDATE1_SKELETON))
-#define IS_TIMEDATE1_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_TIMEDATE1_SKELETON))
+#define TIMEDATED_TYPE_TIMEDATE1_SKELETON (timedated_timedate1_skeleton_get_type ())
+#define TIMEDATED_TIMEDATE1_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TIMEDATED_TYPE_TIMEDATE1_SKELETON, timedatedTimedate1Skeleton))
+#define TIMEDATED_TIMEDATE1_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TIMEDATED_TYPE_TIMEDATE1_SKELETON, timedatedTimedate1SkeletonClass))
+#define TIMEDATED_TIMEDATE1_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TIMEDATED_TYPE_TIMEDATE1_SKELETON, timedatedTimedate1SkeletonClass))
+#define TIMEDATED_IS_TIMEDATE1_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TIMEDATED_TYPE_TIMEDATE1_SKELETON))
+#define TIMEDATED_IS_TIMEDATE1_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TIMEDATED_TYPE_TIMEDATE1_SKELETON))
 
-typedef struct _Timedate1Skeleton Timedate1Skeleton;
-typedef struct _Timedate1SkeletonClass Timedate1SkeletonClass;
-typedef struct _Timedate1SkeletonPrivate Timedate1SkeletonPrivate;
+typedef struct _timedatedTimedate1Skeleton timedatedTimedate1Skeleton;
+typedef struct _timedatedTimedate1SkeletonClass timedatedTimedate1SkeletonClass;
+typedef struct _timedatedTimedate1SkeletonPrivate timedatedTimedate1SkeletonPrivate;
 
-struct _Timedate1Skeleton
+struct _timedatedTimedate1Skeleton
 {
   /*< private >*/
   GDBusInterfaceSkeleton parent_instance;
-  Timedate1SkeletonPrivate *priv;
+  timedatedTimedate1SkeletonPrivate *priv;
 };
 
-struct _Timedate1SkeletonClass
+struct _timedatedTimedate1SkeletonClass
 {
   GDBusInterfaceSkeletonClass parent_class;
 };
 
-GType timedate1_skeleton_get_type (void) G_GNUC_CONST;
+GType timedated_timedate1_skeleton_get_type (void) G_GNUC_CONST;
+
+timedatedTimedate1 *timedated_timedate1_skeleton_new (void);
+
+
+/* ---- */
+
+#define TIMEDATED_TYPE_OBJECT (timedated_object_get_type ())
+#define TIMEDATED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TIMEDATED_TYPE_OBJECT, timedatedObject))
+#define TIMEDATED_IS_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TIMEDATED_TYPE_OBJECT))
+#define TIMEDATED_OBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TIMEDATED_TYPE_OBJECT, timedatedObject))
+
+struct _timedatedObject;
+typedef struct _timedatedObject timedatedObject;
+typedef struct _timedatedObjectIface timedatedObjectIface;
+
+struct _timedatedObjectIface
+{
+  GTypeInterface parent_iface;
+};
+
+GType timedated_object_get_type (void) G_GNUC_CONST;
+
+timedatedTimedate1 *timedated_object_get_timedate1 (timedatedObject *object);
+timedatedTimedate1 *timedated_object_peek_timedate1 (timedatedObject *object);
+
+#define TIMEDATED_TYPE_OBJECT_PROXY (timedated_object_proxy_get_type ())
+#define TIMEDATED_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TIMEDATED_TYPE_OBJECT_PROXY, timedatedObjectProxy))
+#define TIMEDATED_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TIMEDATED_TYPE_OBJECT_PROXY, timedatedObjectProxyClass))
+#define TIMEDATED_OBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TIMEDATED_TYPE_OBJECT_PROXY, timedatedObjectProxyClass))
+#define TIMEDATED_IS_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TIMEDATED_TYPE_OBJECT_PROXY))
+#define TIMEDATED_IS_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TIMEDATED_TYPE_OBJECT_PROXY))
+
+typedef struct _timedatedObjectProxy timedatedObjectProxy;
+typedef struct _timedatedObjectProxyClass timedatedObjectProxyClass;
+typedef struct _timedatedObjectProxyPrivate timedatedObjectProxyPrivate;
+
+struct _timedatedObjectProxy
+{
+  /*< private >*/
+  GDBusObjectProxy parent_instance;
+  timedatedObjectProxyPrivate *priv;
+};
+
+struct _timedatedObjectProxyClass
+{
+  GDBusObjectProxyClass parent_class;
+};
 
-Timedate1 *timedate1_skeleton_new (void);
+GType timedated_object_proxy_get_type (void) G_GNUC_CONST;
+timedatedObjectProxy *timedated_object_proxy_new (GDBusConnection *connection, const gchar *object_path);
+
+#define TIMEDATED_TYPE_OBJECT_SKELETON (timedated_object_skeleton_get_type ())
+#define TIMEDATED_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TIMEDATED_TYPE_OBJECT_SKELETON, timedatedObjectSkeleton))
+#define TIMEDATED_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TIMEDATED_TYPE_OBJECT_SKELETON, timedatedObjectSkeletonClass))
+#define TIMEDATED_OBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TIMEDATED_TYPE_OBJECT_SKELETON, timedatedObjectSkeletonClass))
+#define TIMEDATED_IS_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TIMEDATED_TYPE_OBJECT_SKELETON))
+#define TIMEDATED_IS_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TIMEDATED_TYPE_OBJECT_SKELETON))
+
+typedef struct _timedatedObjectSkeleton timedatedObjectSkeleton;
+typedef struct _timedatedObjectSkeletonClass timedatedObjectSkeletonClass;
+typedef struct _timedatedObjectSkeletonPrivate timedatedObjectSkeletonPrivate;
+
+struct _timedatedObjectSkeleton
+{
+  /*< private >*/
+  GDBusObjectSkeleton parent_instance;
+  timedatedObjectSkeletonPrivate *priv;
+};
+
+struct _timedatedObjectSkeletonClass
+{
+  GDBusObjectSkeletonClass parent_class;
+};
+
+GType timedated_object_skeleton_get_type (void) G_GNUC_CONST;
+timedatedObjectSkeleton *timedated_object_skeleton_new (const gchar *object_path);
+void timedated_object_skeleton_set_timedate1 (timedatedObjectSkeleton *object, timedatedTimedate1 *interface_);
+
+/* ---- */
+
+#define TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT (timedated_object_manager_client_get_type ())
+#define TIMEDATED_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT, timedatedObjectManagerClient))
+#define TIMEDATED_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT, timedatedObjectManagerClientClass))
+#define TIMEDATED_OBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT, timedatedObjectManagerClientClass))
+#define TIMEDATED_IS_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT))
+#define TIMEDATED_IS_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TIMEDATED_TYPE_OBJECT_MANAGER_CLIENT))
+
+typedef struct _timedatedObjectManagerClient timedatedObjectManagerClient;
+typedef struct _timedatedObjectManagerClientClass timedatedObjectManagerClientClass;
+typedef struct _timedatedObjectManagerClientPrivate timedatedObjectManagerClientPrivate;
+
+struct _timedatedObjectManagerClient
+{
+  /*< private >*/
+  GDBusObjectManagerClient parent_instance;
+  timedatedObjectManagerClientPrivate *priv;
+};
+
+struct _timedatedObjectManagerClientClass
+{
+  GDBusObjectManagerClientClass parent_class;
+};
+
+GType timedated_object_manager_client_get_type (void) G_GNUC_CONST;
+
+GType timedated_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data);
+
+void timedated_object_manager_client_new (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data);
+GDBusObjectManager *timedated_object_manager_client_new_finish (
+    GAsyncResult        *res,
+    GError             **error);
+GDBusObjectManager *timedated_object_manager_client_new_sync (
+    GDBusConnection        *connection,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error);
+
+void timedated_object_manager_client_new_for_bus (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GAsyncReadyCallback     callback,
+    gpointer                user_data);
+GDBusObjectManager *timedated_object_manager_client_new_for_bus_finish (
+    GAsyncResult        *res,
+    GError             **error);
+GDBusObjectManager *timedated_object_manager_client_new_for_bus_sync (
+    GBusType                bus_type,
+    GDBusObjectManagerClientFlags  flags,
+    const gchar            *name,
+    const gchar            *object_path,
+    GCancellable           *cancellable,
+    GError                **error);
 
 
 G_END_DECLS