diff --git a/autotests/ktoolbar_unittest.cpp b/autotests/ktoolbar_unittest.cpp
--- a/autotests/ktoolbar_unittest.cpp
+++ b/autotests/ktoolbar_unittest.cpp
@@ -122,7 +122,7 @@
 
     m_xml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         "</MenuBar>\n"
@@ -541,7 +541,7 @@
 {
     const QByteArray windowXml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         "</MenuBar>\n"
diff --git a/autotests/kxmlgui_unittest.cpp b/autotests/kxmlgui_unittest.cpp
--- a/autotests/kxmlgui_unittest.cpp
+++ b/autotests/kxmlgui_unittest.cpp
@@ -53,7 +53,7 @@
 {
     const QByteArray xml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<" + toplevelTag + " version=\"" + QByteArray::number(version) + "\" name=\"foo\" >\n"
         "<MenuBar>\n";
     file.write(xml);
@@ -125,11 +125,11 @@
 
     QTest::newRow("simple test") <<
                                  "<?xml version = '1.0'?>\n"
-                                 "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+                                 "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
                                  "<gui version=\"3\" name=\"foo\"/>\n" << "3";
     QTest::newRow("two digits") <<
                                 "<?xml version = '1.0'?>\n"
-                                "<kpartgui version=\"42\" name=\"foo\"/>\n" << "42";
+                                "<gui version=\"42\" name=\"foo\"/>\n" << "42";
     QTest::newRow("with spaces") << // as found in dirfilterplugin.rc for instance
                                  "<?xml version = '1.0'?>\n"
                                  "<gui version = \"1\" name=\"foo\"/>\n" << "1";
@@ -140,7 +140,7 @@
                                     "<!DOCTYPE kpartgui>\n"
                                     "<!-- This file should be synchronized with kmail_part.rc to provide\n"
                                     "the same menu entries at the same place in KMail and Kontact  -->\n"
-                                    "<kpartgui version=\"452\" name=\"kmmainwin\">\n" << "452";
+                                    "<gui version=\"452\" name=\"kmmainwin\">\n" << "452";
 }
 
 void KXmlGui_UnitTest::testFindVersionNumber()
@@ -318,7 +318,7 @@
 {
     const QByteArray hostXml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         " <Menu name=\"go\"><text>&amp;Go</text>\n"
@@ -378,7 +378,7 @@
 
     const QByteArray partXml =
         "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
-        "<kpartgui version=\"1\" name=\"part\" >\n"
+        "<gui version=\"1\" name=\"part\" >\n"
         "<MenuBar>\n"
         " <Menu name=\"go\"><text>&amp;Go</text>\n"
         "  <Action name=\"go_previous\" group=\"before_merge\"/>\n"
@@ -397,7 +397,7 @@
         "  <Action name=\"other_file_action\"/>\n"
         " </Menu>\n"
         "</MenuBar>\n"
-        "</kpartgui>\n";
+        "</gui>\n";
 
     TestGuiClient partClient(partXml);
     partClient.createActions(QStringList() << QStringLiteral("go_previous") << QStringLiteral("go_next") << QStringLiteral("first_page") <<
@@ -457,7 +457,7 @@
 {
     const QByteArray hostXml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
 // The solution was to remove the duplicated definition
@@ -483,7 +483,7 @@
 
     const QByteArray partXml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         " <Menu name=\"settings\"><text>&amp;Settings</text>\n"
@@ -510,7 +510,7 @@
     QTest::addColumn<QStringList>("expectedMenus");
 
     const QByteArray xmlBegin =
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n";
     const QByteArray xmlEnd =
@@ -626,7 +626,7 @@
 {
     const QByteArray xml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         " <Menu name=\"groups\"><text>Add to Group</text>\n"
@@ -707,7 +707,7 @@
 {
     const QByteArray xml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         "</MenuBar>\n"
@@ -751,7 +751,7 @@
 {
     const QByteArray xml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         "</MenuBar>\n"
@@ -828,7 +828,7 @@
 {
     const QByteArray xml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         "  <Menu deleted=\"true\" name=\"game\"/>\n"
@@ -875,7 +875,7 @@
 {
     const QByteArray xml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         " <Menu name=\"before_separator\"><text>Before Separator</text></Menu>\n"
@@ -900,7 +900,7 @@
 {
     const QByteArray xml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         " <Menu name=\"filemenu\"><text>File Menu</text></Menu>\n"
@@ -987,16 +987,16 @@
 {
     const QByteArray hostXml =
         "<?xml version = '1.0'?>\n"
-        "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+        "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
         "<gui version=\"1\" name=\"foo\" >\n"
         "<MenuBar>\n"
         " <Menu name=\"file\"><text>&amp;File</text>\n"
         " </Menu>\n"
         " <Merge/>\n"
         "</MenuBar>\n"
         "</gui>";
     const QByteArray xml = "<?xml version = '1.0'?>\n"
-                           "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+                           "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
                            "<gui version=\"1\" name=\"foo\" >\n"
                            "<MenuBar>\n"
                            " <Menu name=\"file\"><text>&amp;File</text>\n"
@@ -1027,7 +1027,7 @@
 void KXmlGui_UnitTest::testShortcuts()
 {
     const QByteArray xml = "<?xml version = '1.0'?>\n"
-                           "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n"
+                           "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n"
                            "<gui version=\"1\" name=\"foo\" >\n"
                            "<MenuBar>\n"
                            " <Menu name=\"file\"><text>&amp;File</text>\n"
diff --git a/src/kshortcutschemeseditor.cpp b/src/kshortcutschemeseditor.cpp
--- a/src/kshortcutschemeseditor.cpp
+++ b/src/kshortcutschemeseditor.cpp
@@ -128,7 +128,7 @@
     }
 
     QDomDocument doc;
-    QDomElement docElem = doc.createElement(QStringLiteral("kpartgui"));
+    QDomElement docElem = doc.createElement(QStringLiteral("gui"));
     doc.appendChild(docElem);
     QDomElement elem = doc.createElement(QStringLiteral("ActionProperties"));
     docElem.appendChild(elem);
diff --git a/src/kshortcutschemeshelper.cpp b/src/kshortcutschemeshelper.cpp
--- a/src/kshortcutschemeshelper.cpp
+++ b/src/kshortcutschemeshelper.cpp
@@ -61,7 +61,7 @@
 
         qCDebug(DEBUG_KXMLGUI) << "Considering component" << componentName;
         QDomDocument doc;
-        QDomElement docElem = doc.createElement(QStringLiteral("kpartgui"));
+        QDomElement docElem = doc.createElement(QStringLiteral("gui"));
         docElem.setAttribute(QStringLiteral("version"), QStringLiteral("1"));
         docElem.setAttribute(QStringLiteral("name"), componentName);
         doc.appendChild(docElem);
diff --git a/src/ktoolbarhandler.cpp b/src/ktoolbarhandler.cpp
--- a/src/ktoolbarhandler.cpp
+++ b/src/ktoolbarhandler.cpp
@@ -37,13 +37,13 @@
 const char actionListName[] = "show_menu_and_toolbar_actionlist";
 
 const char guiDescription[] = ""
-                             "<!DOCTYPE kpartgui><kpartgui name=\"StandardToolBarMenuHandler\">"
+                             "<!DOCTYPE kpartgui><gui name=\"StandardToolBarMenuHandler\">"
                              "<MenuBar>"
                              "    <Menu name=\"settings\">"
                              "        <ActionList name=\"%1\" />"
                              "    </Menu>"
                              "</MenuBar>"
-                             "</kpartgui>";
+                             "</gui>";
 
 class BarActionBuilder
 {
diff --git a/src/ui_standards.rc b/src/ui_standards.rc
--- a/src/ui_standards.rc
+++ b/src/ui_standards.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="standard_containers" version="18" translationDomain="kxmlgui5">
+<gui name="standard_containers" version="18" translationDomain="kxmlgui5">
 <MenuBar>
   <MergeLocal name="first_menu"/>
   <Menu name="file"><text>&amp;File</text>
@@ -218,4 +218,4 @@
   <Action name="help"/>
 </ToolBar>
 <StatusBar/>
-</kpartgui>
+</gui>
diff --git a/tests/krichtexteditor/krichtexteditorui.rc b/tests/krichtexteditor/krichtexteditorui.rc
--- a/tests/krichtexteditor/krichtexteditorui.rc
+++ b/tests/krichtexteditor/krichtexteditorui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="krichtexteditor" version="13">
+<gui name="krichtexteditor" version="13">
 
 <MenuBar>
   <Menu noMerge="1" name="format"><text>F&amp;ormat</text>
@@ -59,4 +59,4 @@
   <Action name="action_to_plain_text"/>
 </ToolBar>
 
-</kpartgui>
+</gui>
diff --git a/tests/kwindowtest.rc b/tests/kwindowtest.rc
--- a/tests/kwindowtest.rc
+++ b/tests/kwindowtest.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="windowtest" version="1">
+<gui name="windowtest" version="1">
 	
 	<MenuBar>
 		<Menu name="file" noMerge="1">
@@ -56,4 +56,4 @@
 		<Action name="radioButton4" />
 	</ToolBar>
 
-</kpartgui>
+</gui>
diff --git a/tests/kxmlguitest_part.rc b/tests/kxmlguitest_part.rc
--- a/tests/kxmlguitest_part.rc
+++ b/tests/kxmlguitest_part.rc
@@ -1,8 +1,8 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="7">
+<gui name="khtmlpart" version="7">
 <ToolBar name="mainToolBar"><text>Main Toolbar</text>
  <Action name="decFontSizes" />
  <Separator />
  <Action name="security" />
 </ToolBar>
-</kpartgui>
+</gui>
diff --git a/tests/kxmlguitest_shell.rc b/tests/kxmlguitest_shell.rc
--- a/tests/kxmlguitest_shell.rc
+++ b/tests/kxmlguitest_shell.rc
@@ -1,7 +1,7 @@
-<!DOCTYPE kpartgui ><kpartgui version="31" name="Konqueror" >
+<!DOCTYPE kpartgui ><gui version="31" name="Konqueror" >
  <ToolBar newline="true" name="mainToolBar">
   <text>Main Toolbar</text>
   <Merge/>
   <Action name="splitviewh" />
  </ToolBar>
-</kpartgui>
+</gui>