liblightdm-gobject now uses lightdm_ prefix instead of ldm_

8 files changed, 203 insertions, 203 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d5345989..c054b8af 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,7 +15,7 @@ GTKDOC_LIBS = \
 	$(LIBLIGHTDM_GOBJECT_LIBS) \
 	$(top_builddir)/liblightdm-gobject/liblightdm-gobject-0.la
 
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=ldm
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=LightDM
 
 DISTCLEANFILES = \
 	$(DOC_MODULE)-docs.xml \
diff --git a/doc/lightdm-gobject-0-sections.txt b/doc/lightdm-gobject-0-sections.txt
index 2c5814be..06002e30 100644
--- a/doc/lightdm-gobject-0-sections.txt
+++ b/doc/lightdm-gobject-0-sections.txt
@@ -2,141 +2,141 @@
 
 <SECTION>
 <FILE>language</FILE>
-<TITLE>LdmLanguage</TITLE>
-ldm_language_get_code
-ldm_language_get_name
-ldm_language_get_territory
-ldm_language_matches
+<TITLE>LightDMLanguage</TITLE>
+lightdm_language_get_code
+lightdm_language_get_name
+lightdm_language_get_territory
+lightdm_language_matches
 <SUBSECTION Standard>
-LDM_IS_LANGUAGE
-LDM_IS_LANGUAGE_CLASS
-LDM_LANGUAGE
-LDM_LANGUAGE_CLASS
-LDM_LANGUAGE_GET_CLASS
-LDM_TYPE_LANGUAGE
-ldm_language_get_type
+LIGHTDM_IS_LANGUAGE
+LIGHTDM_IS_LANGUAGE_CLASS
+LIGHTDM_LANGUAGE
+LIGHTDM_LANGUAGE_CLASS
+LIGHTDM_LANGUAGE_GET_CLASS
+LIGHTDM_TYPE_LANGUAGE
+lightdm_language_get_type
 <SUBSECTION Private>
-ldm_language_new
+lightdm_language_new
 </SECTION>
 
 <SECTION>
 <FILE>layout</FILE>
-<TITLE>LdmLayout</TITLE>
-ldm_layout_get_name
-ldm_layout_get_short_description
-ldm_layout_get_description
+<TITLE>LightDMLayout</TITLE>
+lightdm_layout_get_name
+lightdm_layout_get_short_description
+lightdm_layout_get_description
 <SUBSECTION Standard>
-LDM_IS_LAYOUT
-LDM_IS_LAYOUT_CLASS
-LDM_LAYOUT
-LDM_LAYOUT_CLASS
-LDM_LAYOUT_GET_CLASS
-LDM_TYPE_LAYOUT
-ldm_layout_get_type
+LIGHTDM_IS_LAYOUT
+LIGHTDM_IS_LAYOUT_CLASS
+LIGHTDM_LAYOUT
+LIGHTDM_LAYOUT_CLASS
+LIGHTDM_LAYOUT_GET_CLASS
+LIGHTDM_TYPE_LAYOUT
+lightdm_layout_get_type
 <SUBSECTION Private>
-ldm_layout_new
+lightdm_layout_new
 </SECTION>
 
 <SECTION>
 <FILE>user</FILE>
-<TITLE>LdmUser</TITLE>
-ldm_user_get_name
-ldm_user_get_real_name
-ldm_user_get_display_name
-ldm_user_get_home_directory
-ldm_user_get_image
-ldm_user_get_language
-ldm_user_get_layout
-ldm_user_get_session
-ldm_user_get_logged_in
+<TITLE>LightDMUser</TITLE>
+lightdm_user_get_name
+lightdm_user_get_real_name
+lightdm_user_get_display_name
+lightdm_user_get_home_directory
+lightdm_user_get_image
+lightdm_user_get_language
+lightdm_user_get_layout
+lightdm_user_get_session
+lightdm_user_get_logged_in
 <SUBSECTION Standard>
-LDM_USER
-LDM_IS_USER
-LDM_TYPE_USER
-ldm_user_get_type
-LDM_USER_CLASS
-LDM_IS_USER_CLASS
-LDM_USER_GET_CLASS
+LIGHTDM_USER
+LIGHTDM_IS_USER
+LIGHTDM_TYPE_USER
+lightdm_user_get_type
+LIGHTDM_USER_CLASS
+LIGHTDM_IS_USER_CLASS
+LIGHTDM_USER_GET_CLASS
 <SUBSECTION Private>
-ldm_user_new
-ldm_user_set_name
-ldm_user_set_real_name
-ldm_user_set_home_directory
-ldm_user_set_image
-ldm_user_set_logged_in
-ldm_user_update
+lightdm_user_new
+lightdm_user_set_name
+lightdm_user_set_real_name
+lightdm_user_set_home_directory
+lightdm_user_set_image
+lightdm_user_set_logged_in
+lightdm_user_update
 </SECTION>
 
 <SECTION>
 <FILE>session</FILE>
-<TITLE>LdmSession</TITLE>
-ldm_session_get_key
-ldm_session_get_name
-ldm_session_get_comment
+<TITLE>LightDMSession</TITLE>
+lightdm_session_get_key
+lightdm_session_get_name
+lightdm_session_get_comment
 <SUBSECTION Standard>
-LDM_SESSION
-LDM_IS_SESSION
-LDM_TYPE_SESSION
-ldm_session_get_type
-LDM_SESSION_CLASS
-LDM_IS_SESSION_CLASS
-LDM_SESSION_GET_CLASS
+LIGHTDM_SESSION
+LIGHTDM_IS_SESSION
+LIGHTDM_TYPE_SESSION
+lightdm_session_get_type
+LIGHTDM_SESSION_CLASS
+LIGHTDM_IS_SESSION_CLASS
+LIGHTDM_SESSION_GET_CLASS
 <SUBSECTION Private>
-ldm_session_new
+lightdm_session_new
 </SECTION>
 
 <SECTION>
 <FILE>greeter</FILE>
-<TITLE>LdmGreeter</TITLE>
-LdmMessageType
-LdmPromptType
-ldm_greeter_new
-ldm_greeter_connect_to_server
-ldm_greeter_get_hostname
-ldm_greeter_get_num_users
-ldm_greeter_get_users
-ldm_greeter_get_user_by_name
-ldm_greeter_get_default_language
-ldm_greeter_get_languages
-ldm_greeter_get_layouts
-ldm_greeter_get_layout
-ldm_greeter_set_layout
-ldm_greeter_get_sessions
-ldm_greeter_get_default_session_hint
-ldm_greeter_get_hint
-ldm_greeter_get_has_guest_account_hint
-ldm_greeter_get_hide_users_hint
-ldm_greeter_get_select_user_hint
-ldm_greeter_get_select_guest_hint
-ldm_greeter_get_autologin_user_hint
-ldm_greeter_get_autologin_guest_hint
-ldm_greeter_get_autologin_timeout_hint
-ldm_greeter_cancel_timed_login
-ldm_greeter_login
-ldm_greeter_login_with_user_prompt
-ldm_greeter_login_as_guest
-ldm_greeter_respond
-ldm_greeter_cancel_authentication
-ldm_greeter_get_in_authentication
-ldm_greeter_get_is_authenticated
-ldm_greeter_get_authentication_user
-ldm_greeter_start_session
-ldm_greeter_start_default_session
-ldm_greeter_get_can_suspend
-ldm_greeter_suspend
-ldm_greeter_get_can_hibernate
-ldm_greeter_hibernate
-ldm_greeter_get_can_restart
-ldm_greeter_restart
-ldm_greeter_get_can_shutdown
-ldm_greeter_shutdown
+<TITLE>LightDMGreeter</TITLE>
+LightDMMessageType
+LightDMPromptType
+lightdm_greeter_new
+lightdm_greeter_connect_to_server
+lightdm_greeter_get_hostname
+lightdm_greeter_get_num_users
+lightdm_greeter_get_users
+lightdm_greeter_get_user_by_name
+lightdm_greeter_get_default_language
+lightdm_greeter_get_languages
+lightdm_greeter_get_layouts
+lightdm_greeter_get_layout
+lightdm_greeter_set_layout
+lightdm_greeter_get_sessions
+lightdm_greeter_get_default_session_hint
+lightdm_greeter_get_hint
+lightdm_greeter_get_has_guest_account_hint
+lightdm_greeter_get_hide_users_hint
+lightdm_greeter_get_select_user_hint
+lightdm_greeter_get_select_guest_hint
+lightdm_greeter_get_autologin_user_hint
+lightdm_greeter_get_autologin_guest_hint
+lightdm_greeter_get_autologin_timeout_hint
+lightdm_greeter_cancel_timed_login
+lightdm_greeter_login
+lightdm_greeter_login_with_user_prompt
+lightdm_greeter_login_as_guest
+lightdm_greeter_respond
+lightdm_greeter_cancel_authentication
+lightdm_greeter_get_in_authentication
+lightdm_greeter_get_is_authenticated
+lightdm_greeter_get_authentication_user
+lightdm_greeter_start_session
+lightdm_greeter_start_default_session
+lightdm_greeter_get_can_suspend
+lightdm_greeter_suspend
+lightdm_greeter_get_can_hibernate
+lightdm_greeter_hibernate
+lightdm_greeter_get_can_restart
+lightdm_greeter_restart
+lightdm_greeter_get_can_shutdown
+lightdm_greeter_shutdown
 <SUBSECTION Standard>
-LDM_GREETER
-LDM_IS_GREETER
-LDM_TYPE_GREETER
-ldm_greeter_get_type
-LDM_GREETER_CLASS
-LDM_IS_GREETER_CLASS
-LDM_GREETER_GET_CLASS
+LIGHTDM_GREETER
+LIGHTDM_IS_GREETER
+LIGHTDM_TYPE_GREETER
+lightdm_greeter_get_type
+LIGHTDM_GREETER_CLASS
+LIGHTDM_IS_GREETER_CLASS
+LIGHTDM_GREETER_GET_CLASS
 <SUBSECTION Private>
 </SECTION>
diff --git a/doc/lightdm-gobject-0.types b/doc/lightdm-gobject-0.types
index c0150a70..3ea90fed 100644
--- a/doc/lightdm-gobject-0.types
+++ b/doc/lightdm-gobject-0.types
@@ -1,5 +1,5 @@
-ldm_greeter_get_type
-ldm_language_get_type
-ldm_layout_get_type
-ldm_session_get_type
-ldm_user_get_type
+lightdm_greeter_get_type
+lightdm_language_get_type
+lightdm_layout_get_type
+lightdm_session_get_type
+lightdm_user_get_type
diff --git a/doc/tmpl/greeter.sgml b/doc/tmpl/greeter.sgml
index 33d9172e..e56b6c29 100644
--- a/doc/tmpl/greeter.sgml
+++ b/doc/tmpl/greeter.sgml
@@ -1,12 +1,12 @@
 <!-- ##### SECTION Title ##### -->
-LdmGreeter
+LightDMGreeter
 
 <!-- ##### SECTION Short_Description ##### -->
 Manages connection to LightDM server and provides greeter functionality
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-#LdmGreeter is an object that manages the connection to the LightDM server and provides common greeter functionality.
+#LightDMGreeter is an object that manages the connection to the LightDM server and provides common greeter functionality.
 </para>
 <para>
 <example>
@@ -14,7 +14,7 @@ Manages connection to LightDM server and provides greeter functionality
 <programlisting><![CDATA[
 int main ()
 {
-    LdmGreeter *greeter = ldm_greeter_new ();
+    LightDMGreeter *greeter = lightdm_greeter_new ();
 
     g_object_connect (greeter, "connected", G_CALLBACK (connected_cb), NULL);
     g_object_connect (greeter, "show-prompt", G_CALLBACK (show_prompt_cb), NULL);
@@ -22,32 +22,32 @@ int main ()
     g_object_connect (greeter, "session-failed", G_CALLBACK (session_failed_cb), NULL);
     g_object_connect (greeter, "quit", G_CALLBACK (quit_cb), NULL);
 
-    if (!ldm_greeter_connect_to_server (LDM_GREETER (greeter))) {
+    if (!lightdm_greeter_connect_to_server (LIGHTDM_GREETER (greeter))) {
         // Log an error
         return 0;
     }
 }
 
-static void connected_cb (LdmGreeter *greeter)
+static void connected_cb (LightDMGreeter *greeter)
 {
     // Start authentication
-    ldm_greeter_login_with_user_prompt (greeter);
+    lightdm_greeter_login_with_user_prompt (greeter);
 }
 
-static void show_prompt_cb (LdmGreeter *greeter, const char *text, LdmPromptType type)
+static void show_prompt_cb (LightDMGreeter *greeter, const char *text, LightDMPromptType type)
 {
     // Show the user the message and prompt for some response
     gchar *secret = prompt_user (text, type);
 
     // Give the result to the user
-    ldm_greeter_respond (greeter, response);
+    lightdm_greeter_respond (greeter, response);
 }
 
-static void authentication_complete_cb (LdmGreeter *greeter)
+static void authentication_complete_cb (LightDMGreeter *greeter)
 {
-    if (ldm_greeter_get_is_authenticated (greeter)) {
+    if (lightdm_greeter_get_is_authenticated (greeter)) {
         // Start the user session
-        ldm_greeter_start_default_session (greeter);
+        lightdm_greeter_start_default_session (greeter);
     }
     else {
         // Display a warning and reset the greeter
@@ -55,13 +55,13 @@ static void authentication_complete_cb (LdmGreeter *greeter)
     }
 }
 
-static void session_failed_cb (LdmGreeter *greeter)
+static void session_failed_cb (LightDMGreeter *greeter)
 {
     // Display a warning and reset the greeter
     reset_login_screen (``Failed to login'');
 }
 
-static void quit_cb (LdmGreeter *greeter)
+static void quit_cb (LightDMGreeter *greeter)
 {
     // Clean up
     // ...
@@ -83,23 +83,23 @@ static void quit_cb (LdmGreeter *greeter)
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### ENUM LdmMessageType ##### -->
+<!-- ##### ENUM LightDMMessageType ##### -->
 <para>
 
 </para>
 
-@LDM_MESSAGE_TYPE_INFO: 
-@LDM_MESSAGE_TYPE_ERROR: 
+@LIGHTDM_MESSAGE_TYPE_INFO: 
+@LIGHTDM_MESSAGE_TYPE_ERROR: 
 
-<!-- ##### ENUM LdmPromptType ##### -->
+<!-- ##### ENUM LightDMPromptType ##### -->
 <para>
 
 </para>
 
-@LDM_PROMPT_TYPE_QUESTION: 
-@LDM_PROMPT_TYPE_SECRET: 
+@LIGHTDM_PROMPT_TYPE_QUESTION: 
+@LIGHTDM_PROMPT_TYPE_SECRET: 
 
-<!-- ##### FUNCTION ldm_greeter_new ##### -->
+<!-- ##### FUNCTION lightdm_greeter_new ##### -->
 <para>
 
 </para>
@@ -108,7 +108,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_connect_to_server ##### -->
+<!-- ##### FUNCTION lightdm_greeter_connect_to_server ##### -->
 <para>
 
 </para>
@@ -117,7 +117,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_hostname ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_hostname ##### -->
 <para>
 
 </para>
@@ -126,7 +126,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_num_users ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_num_users ##### -->
 <para>
 
 </para>
@@ -135,7 +135,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_users ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_users ##### -->
 <para>
 
 </para>
@@ -144,7 +144,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_user_by_name ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_user_by_name ##### -->
 <para>
 
 </para>
@@ -154,7 +154,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_default_language ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_default_language ##### -->
 <para>
 
 </para>
@@ -163,7 +163,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_languages ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_languages ##### -->
 <para>
 
 </para>
@@ -172,7 +172,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_layouts ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_layouts ##### -->
 <para>
 
 </para>
@@ -181,7 +181,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_layout ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_layout ##### -->
 <para>
 
 </para>
@@ -190,7 +190,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_set_layout ##### -->
+<!-- ##### FUNCTION lightdm_greeter_set_layout ##### -->
 <para>
 
 </para>
@@ -199,7 +199,7 @@ static void quit_cb (LdmGreeter *greeter)
 @layout: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_sessions ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_sessions ##### -->
 <para>
 
 </para>
@@ -208,7 +208,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_default_session_hint ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_default_session_hint ##### -->
 <para>
 
 </para>
@@ -217,7 +217,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_hint ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_hint ##### -->
 <para>
 
 </para>
@@ -227,7 +227,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_has_guest_account_hint ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_has_guest_account_hint ##### -->
 <para>
 
 </para>
@@ -236,7 +236,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_hide_users_hint ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_hide_users_hint ##### -->
 <para>
 
 </para>
@@ -245,7 +245,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_select_user_hint ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_select_user_hint ##### -->
 <para>
 
 </para>
@@ -254,7 +254,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_select_guest_hint ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_select_guest_hint ##### -->
 <para>
 
 </para>
@@ -263,7 +263,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_autologin_user_hint ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_autologin_user_hint ##### -->
 <para>
 
 </para>
@@ -272,7 +272,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_autologin_guest_hint ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_autologin_guest_hint ##### -->
 <para>
 
 </para>
@@ -281,7 +281,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_autologin_timeout_hint ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_autologin_timeout_hint ##### -->
 <para>
 
 </para>
@@ -290,7 +290,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_cancel_timed_login ##### -->
+<!-- ##### FUNCTION lightdm_greeter_cancel_timed_login ##### -->
 <para>
 
 </para>
@@ -298,7 +298,7 @@ static void quit_cb (LdmGreeter *greeter)
 @greeter: 
 
 
-<!-- ##### FUNCTION ldm_greeter_login ##### -->
+<!-- ##### FUNCTION lightdm_greeter_login ##### -->
 <para>
 
 </para>
@@ -307,7 +307,7 @@ static void quit_cb (LdmGreeter *greeter)
 @username: 
 
 
-<!-- ##### FUNCTION ldm_greeter_login_with_user_prompt ##### -->
+<!-- ##### FUNCTION lightdm_greeter_login_with_user_prompt ##### -->
 <para>
 
 </para>
@@ -315,7 +315,7 @@ static void quit_cb (LdmGreeter *greeter)
 @greeter: 
 
 
-<!-- ##### FUNCTION ldm_greeter_login_as_guest ##### -->
+<!-- ##### FUNCTION lightdm_greeter_login_as_guest ##### -->
 <para>
 
 </para>
@@ -323,7 +323,7 @@ static void quit_cb (LdmGreeter *greeter)
 @greeter: 
 
 
-<!-- ##### FUNCTION ldm_greeter_respond ##### -->
+<!-- ##### FUNCTION lightdm_greeter_respond ##### -->
 <para>
 
 </para>
@@ -332,7 +332,7 @@ static void quit_cb (LdmGreeter *greeter)
 @response: 
 
 
-<!-- ##### FUNCTION ldm_greeter_cancel_authentication ##### -->
+<!-- ##### FUNCTION lightdm_greeter_cancel_authentication ##### -->
 <para>
 
 </para>
@@ -340,7 +340,7 @@ static void quit_cb (LdmGreeter *greeter)
 @greeter: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_in_authentication ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_in_authentication ##### -->
 <para>
 
 </para>
@@ -349,7 +349,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_is_authenticated ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_is_authenticated ##### -->
 <para>
 
 </para>
@@ -358,7 +358,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_authentication_user ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_authentication_user ##### -->
 <para>
 
 </para>
@@ -367,7 +367,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_start_session ##### -->
+<!-- ##### FUNCTION lightdm_greeter_start_session ##### -->
 <para>
 
 </para>
@@ -376,7 +376,7 @@ static void quit_cb (LdmGreeter *greeter)
 @session: 
 
 
-<!-- ##### FUNCTION ldm_greeter_start_default_session ##### -->
+<!-- ##### FUNCTION lightdm_greeter_start_default_session ##### -->
 <para>
 
 </para>
@@ -384,7 +384,7 @@ static void quit_cb (LdmGreeter *greeter)
 @greeter: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_can_suspend ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_can_suspend ##### -->
 <para>
 
 </para>
@@ -393,7 +393,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_suspend ##### -->
+<!-- ##### FUNCTION lightdm_greeter_suspend ##### -->
 <para>
 
 </para>
@@ -401,7 +401,7 @@ static void quit_cb (LdmGreeter *greeter)
 @greeter: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_can_hibernate ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_can_hibernate ##### -->
 <para>
 
 </para>
@@ -410,7 +410,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_hibernate ##### -->
+<!-- ##### FUNCTION lightdm_greeter_hibernate ##### -->
 <para>
 
 </para>
@@ -418,7 +418,7 @@ static void quit_cb (LdmGreeter *greeter)
 @greeter: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_can_restart ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_can_restart ##### -->
 <para>
 
 </para>
@@ -427,7 +427,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_restart ##### -->
+<!-- ##### FUNCTION lightdm_greeter_restart ##### -->
 <para>
 
 </para>
@@ -435,7 +435,7 @@ static void quit_cb (LdmGreeter *greeter)
 @greeter: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_can_shutdown ##### -->
+<!-- ##### FUNCTION lightdm_greeter_get_can_shutdown ##### -->
 <para>
 
 </para>
@@ -444,7 +444,7 @@ static void quit_cb (LdmGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_shutdown ##### -->
+<!-- ##### FUNCTION lightdm_greeter_shutdown ##### -->
 <para>
 
 </para>
diff --git a/doc/tmpl/language.sgml b/doc/tmpl/language.sgml
index 3c7c59d8..c78ffc5d 100644
--- a/doc/tmpl/language.sgml
+++ b/doc/tmpl/language.sgml
@@ -1,12 +1,12 @@
 <!-- ##### SECTION Title ##### -->
-LdmLanguage
+LightDMLanguage
 
 <!-- ##### SECTION Short_Description ##### -->
 Information about an available language
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-#LdmLanguage is an object that describes a language that is available on the system.
+#LightDMLanguage is an object that describes a language that is available on the system.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -20,7 +20,7 @@ Information about an available language
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### FUNCTION ldm_language_get_code ##### -->
+<!-- ##### FUNCTION lightdm_language_get_code ##### -->
 <para>
 
 </para>
@@ -29,7 +29,7 @@ Information about an available language
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_language_get_name ##### -->
+<!-- ##### FUNCTION lightdm_language_get_name ##### -->
 <para>
 
 </para>
@@ -38,7 +38,7 @@ Information about an available language
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_language_get_territory ##### -->
+<!-- ##### FUNCTION lightdm_language_get_territory ##### -->
 <para>
 
 </para>
@@ -47,7 +47,7 @@ Information about an available language
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_language_matches ##### -->
+<!-- ##### FUNCTION lightdm_language_matches ##### -->
 <para>
 
 </para>
diff --git a/doc/tmpl/layout.sgml b/doc/tmpl/layout.sgml
index d12d921c..5dc905c6 100644
--- a/doc/tmpl/layout.sgml
+++ b/doc/tmpl/layout.sgml
@@ -1,12 +1,12 @@
 <!-- ##### SECTION Title ##### -->
-LdmLayout
+LightDMLayout
 
 <!-- ##### SECTION Short_Description ##### -->
 Information about an available keyboard layout
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-#LdmLayout is an object that describes a keyboard that is available on the system.
+#LightDMLayout is an object that describes a keyboard that is available on the system.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -20,7 +20,7 @@ Information about an available keyboard layout
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### FUNCTION ldm_layout_get_name ##### -->
+<!-- ##### FUNCTION lightdm_layout_get_name ##### -->
 <para>
 
 </para>
@@ -29,7 +29,7 @@ Information about an available keyboard layout
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_layout_get_short_description ##### -->
+<!-- ##### FUNCTION lightdm_layout_get_short_description ##### -->
 <para>
 
 </para>
@@ -38,7 +38,7 @@ Information about an available keyboard layout
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_layout_get_description ##### -->
+<!-- ##### FUNCTION lightdm_layout_get_description ##### -->
 <para>
 
 </para>
diff --git a/doc/tmpl/session.sgml b/doc/tmpl/session.sgml
index 8f947783..7fe247c7 100644
--- a/doc/tmpl/session.sgml
+++ b/doc/tmpl/session.sgml
@@ -1,12 +1,12 @@
 <!-- ##### SECTION Title ##### -->
-LdmSession
+LightDMSession
 
 <!-- ##### SECTION Short_Description ##### -->
 Information about an available session
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-Object containing information about a session type. #LdmSession objects are not created by the user, but provided by the #LdmGreeter object.
+Object containing information about a session type. #LightDMSession objects are not created by the user, but provided by the #LightDMGreeter object.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -20,7 +20,7 @@ Object containing information about a session type. #LdmSession objects are not
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### FUNCTION ldm_session_get_key ##### -->
+<!-- ##### FUNCTION lightdm_session_get_key ##### -->
 <para>
 
 </para>
@@ -29,7 +29,7 @@ Object containing information about a session type. #LdmSession objects are not
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_session_get_name ##### -->
+<!-- ##### FUNCTION lightdm_session_get_name ##### -->
 <para>
 
 </para>
@@ -38,7 +38,7 @@ Object containing information about a session type. #LdmSession objects are not
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_session_get_comment ##### -->
+<!-- ##### FUNCTION lightdm_session_get_comment ##### -->
 <para>
 
 </para>
diff --git a/doc/tmpl/user.sgml b/doc/tmpl/user.sgml
index 0fae16c7..fcfa9a92 100644
--- a/doc/tmpl/user.sgml
+++ b/doc/tmpl/user.sgml
@@ -1,12 +1,12 @@
 <!-- ##### SECTION Title ##### -->
-LdmUser
+LightDMUser
 
 <!-- ##### SECTION Short_Description ##### -->
 Information about a user account
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-Object containing information about a user present on this system. #LdmUser objects are not created by the user, but provided by the #LdmGreeter object.
+Object containing information about a user present on this system. #LightDMUser objects are not created by the user, but provided by the #LightDMGreeter object.
 </para>
 <para>
 A user has the following properties:
@@ -36,7 +36,7 @@ A user has the following properties:
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### FUNCTION ldm_user_get_name ##### -->
+<!-- ##### FUNCTION lightdm_user_get_name ##### -->
 <para>
 
 </para>
@@ -45,7 +45,7 @@ A user has the following properties:
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_user_get_real_name ##### -->
+<!-- ##### FUNCTION lightdm_user_get_real_name ##### -->
 <para>
 
 </para>
@@ -54,7 +54,7 @@ A user has the following properties:
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_user_get_display_name ##### -->
+<!-- ##### FUNCTION lightdm_user_get_display_name ##### -->
 <para>
 
 </para>
@@ -63,7 +63,7 @@ A user has the following properties:
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_user_get_home_directory ##### -->
+<!-- ##### FUNCTION lightdm_user_get_home_directory ##### -->
 <para>
 
 </para>
@@ -72,7 +72,7 @@ A user has the following properties:
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_user_get_image ##### -->
+<!-- ##### FUNCTION lightdm_user_get_image ##### -->
 <para>
 
 </para>
@@ -81,7 +81,7 @@ A user has the following properties:
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_user_get_language ##### -->
+<!-- ##### FUNCTION lightdm_user_get_language ##### -->
 <para>
 
 </para>
@@ -90,7 +90,7 @@ A user has the following properties:
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_user_get_layout ##### -->
+<!-- ##### FUNCTION lightdm_user_get_layout ##### -->
 <para>
 
 </para>
@@ -99,7 +99,7 @@ A user has the following properties:
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_user_get_session ##### -->
+<!-- ##### FUNCTION lightdm_user_get_session ##### -->
 <para>
 
 </para>
@@ -108,7 +108,7 @@ A user has the following properties:
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_user_get_logged_in ##### -->
+<!-- ##### FUNCTION lightdm_user_get_logged_in ##### -->
 <para>
 
 </para>