diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index 07b096f22..5bf2e5cda 100644
--- a/docs/reference/glib/glib-docs.xml
+++ b/docs/reference/glib/glib-docs.xml
@@ -90,8 +90,8 @@
     <xi:include href="xml/gregex.xml" />
     <xi:include href="regex-syntax.xml" />
     <xi:include href="xml/markup.xml" />
-    <xi:include href="xml/keyfile.xml" />
-    <xi:include href="xml/bookmarkfile.xml" />
+    <xi:include href="xml/gkeyfile.xml" />
+    <xi:include href="xml/gbookmarkfile.xml" />
     <xi:include href="xml/testing.xml" />
     <xi:include href="xml/gunix.xml" />
     <xi:include href="xml/windows.xml" />
diff --git a/docs/reference/glib/glib-sections.txt.in b/docs/reference/glib/glib-sections.txt.in
index 89a2d4988..103c688ac 100644
--- a/docs/reference/glib/glib-sections.txt.in
+++ b/docs/reference/glib/glib-sections.txt.in
@@ -2064,7 +2064,7 @@ GErrorType
 
 <SECTION>
 <TITLE>Key-value file parser</TITLE>
-<FILE>keyfile</FILE>
+<FILE>gkeyfile</FILE>
 GKeyFile
 G_KEY_FILE_ERROR
 GKeyFileError
@@ -2159,7 +2159,7 @@ g_key_file_get_type
 
 <SECTION>
 <TITLE>Bookmark file parser</TITLE>
-<FILE>bookmarkfile</FILE>
+<FILE>gbookmarkfile</FILE>
 GBookmarkFile
 G_BOOKMARK_FILE_ERROR
 GBookmarkFileError
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 3988e3653..80e835bac 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -53,7 +53,7 @@
 
 
 /**
- * SECTION:bookmarkfile
+ * SECTION:gbookmarkfile
  * @title: Bookmark file parser
  * @short_description: parses files containing bookmarks
  *
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 1fcef9fc9..145136706 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -74,7 +74,7 @@
 
 
 /**
- * SECTION:keyfile
+ * SECTION:gkeyfile
  * @title: Key-value file parser
  * @short_description: parses .ini-like config files
  *
@@ -160,6 +160,7 @@
  * restricted to ASCII characters.
  *
  * Here is an example of loading a key file and reading a value:
+ *
  * |[<!-- language="C" -->
  * g_autoptr(GError) error = NULL;
  * g_autoptr(GKeyFile) key_file = g_key_file_new ();
@@ -186,6 +187,7 @@
  * ]|
  *
  * Here is an example of creating and saving a key file:
+ *
  * |[<!-- language="C" -->
  * g_autoptr(GKeyFile) key_file = g_key_file_new ();
  * const gchar *val = …;