diff --git a/libnm/generate-docs-nm-property-infos.pl b/libnm/generate-docs-nm-property-infos.pl
index 540ecb6e6..bbdec3b63 100755
--- a/libnm/generate-docs-nm-property-infos.pl
+++ b/libnm/generate-docs-nm-property-infos.pl
@@ -131,17 +131,13 @@ sub process_data {
 # - XML handling -
 sub write_header {
   (my $header =
-    qq{<?xml version=\"1.0\"?>
-       <!DOCTYPE nm-$plugin-docs [
-       ]>
-
-       <nm-$plugin-docs>
+    qq{<nm-setting-docs>
   }) =~ s/^ {7}//mg;
   print {$fo} $header;
 }
 
 sub write_footer {
-  my $footer = "</nm-$plugin-docs>";
+  my $footer = "</nm-setting-docs>";
   print {$fo} $footer;
 }
 
diff --git a/libnm/generate-docs-nm-settings-docs-merge.py b/libnm/generate-docs-nm-settings-docs-merge.py
index 8aba67391..64f899ff1 100755
--- a/libnm/generate-docs-nm-settings-docs-merge.py
+++ b/libnm/generate-docs-nm-settings-docs-merge.py
@@ -107,7 +107,7 @@ output_xml_file = sys.argv[1]
 
 xml_roots = list([ET.parse(f).getroot() for f in sys.argv[2:]])
 
-assert(all([root.tag.startswith('nm-') for root in xml_roots]))
+assert(all([root.tag == 'nm-setting-docs' for root in xml_roots]))
 
 settings_roots = list([node_to_dict(root, 'setting', 'name') for root in xml_roots])
 
diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl
index e14b742fe..13f4ad6bc 100644
--- a/man/nm-settings-ifcfg-rh.xsl
+++ b/man/nm-settings-ifcfg-rh.xsl
@@ -8,7 +8,7 @@
 
   <!-- We need to strip whitespaces so that position() function counts correctly.
        http://www.oxygenxml.com/archives/xsl-list/200305/msg00430.html -->
-  <xsl:strip-space elements="nm-ifcfg-rh-docs setting" />
+  <xsl:strip-space elements="nm-setting-docs setting" />
 
   <xsl:output
       method="xml"
@@ -16,7 +16,7 @@
       doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
       />
 
-  <xsl:template match="nm-ifcfg-rh-docs">
+  <xsl:template match="nm-setting-docs">
     <refentry id="nm-settings-ifcfg-rh">
       <refentryinfo>
         <title>nm-settings-ifcfg-rh</title>
diff --git a/man/nm-settings-keyfile.xsl b/man/nm-settings-keyfile.xsl
index c22bd4fc0..c70228bbc 100644
--- a/man/nm-settings-keyfile.xsl
+++ b/man/nm-settings-keyfile.xsl
@@ -12,7 +12,7 @@
       doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
       />
 
-  <xsl:template match="nm-keyfile-docs">
+  <xsl:template match="nm-setting-docs">
     <refentry id="nm-settings-keyfile">
       <refentryinfo>
         <title>nm-settings-keyfile</title>