diff --git a/po/POTFILES.in b/po/POTFILES.in
index aee7f1f2a6153eeec41c325ef2e0c801e9174a7f..828c829148d64704cba3c9b5815dfa3bc5bf5379 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,35 +2,23 @@
 # Please keep this file sorted alphabetically.
 gxml/Collections.vala
 gxml/CssSelectorParser.vala
-gxml/Document.vala
 gxml/DomCharacter.vala
 gxml/DomNode.vala
 gxml/Enumeration.vala
+gxml/GDomCollections.vala
+gxml/GDomRange.vala
 gxml/GomBaseCollection.vala
 gxml/GomDocument.vala
 gxml/GomElement.vala
 gxml/GomHashPairedMap.vala
 gxml/GomNode.vala
 gxml/GomObject.vala
-gxml/GXmlParser.vala
 gxml/GomProperty.vala
 gxml/GomSchema.vala
-gxml/GXmlDocument.vala
-gxml/GXmlDomCollections.vala
-gxml/GXmlDomRange.vala
-gxml/GXmlElement.vala
-gxml/GXmlHashMapAttr.vala
-gxml/GXmlNode.vala
-gxml/GXmlText.vala
-gxml/Node.vala
 gxml/Parser.vala
-gxml/SerializableEnum.vala
-gxml/SerializableGeeArrayList.vala
-gxml/SerializableGeeDualKeyMap.vala
-gxml/SerializableGeeHashMap.vala
-gxml/SerializableGeeTreeMap.vala
-gxml/SerializableObjectModel.vala
-gxml/SerializableProperty.vala
-gxml/Serializable.vala
-gxml/TDocument.vala
+gxml/XDocument.vala
+gxml/XdParser.vala
+gxml/XElement.vala
+gxml/XHashMapAttr.vala
+gxml/XNode.vala
 gxml/XParser.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index c2570138701436705a1ddf8e5ba2383d40c3eb7f..85f294394e4dd1a7777cc7dcda70ac3a6a202008 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,69 +2,23 @@
 # Please keep this file sorted alphabetically.
 gxml/Collections.c
 gxml/CssSelectorParser.c
-gxml/Document.c
 gxml/DomCharacter.c
 gxml/DomNode.c
 gxml/Enumeration.c
+gxml/GDomCollections.c
+gxml/GDomRange.c
 gxml/GomBaseCollection.c
 gxml/GomDocument.c
 gxml/GomElement.c
 gxml/GomHashPairedMap.c
 gxml/GomNode.c
 gxml/GomObject.c
-gxml/GXmlParser.c
 gxml/GomProperty.c
 gxml/GomSchema.c
-gxml/GXmlDocument.c
-gxml/GXmlDomCollections.c
-gxml/GXmlDomRange.c
-gxml/GXmlElement.c
-gxml/GXmlHashMapAttr.c
-gxml/GXmlNode.c
-gxml/GXmlText.c
-gxml/Node.c
 gxml/Parser.c
-gxml/Serializable.c
-gxml/SerializableEnum.c
-gxml/SerializableGeeArrayList.c
-gxml/SerializableGeeDualKeyMap.c
-gxml/SerializableGeeHashMap.c
-gxml/SerializableGeeTreeMap.c
-gxml/SerializableObjectModel.c
-gxml/SerializableProperty.c
-gxml/TDocument.c
+gxml/XDocument.c
+gxml/XdParser.c
+gxml/XElement.c
+gxml/XHashMapAttr.c
+gxml/XNode.c
 gxml/XParser.c
-sub/gxml/Collections.c
-sub/gxml/CssSelectorParser.c
-sub/gxml/Document.c
-sub/gxml/DomCharacter.c
-sub/gxml/DomNode.c
-sub/gxml/Enumeration.c
-sub/gxml/GomBaseCollection.c
-sub/gxml/GomDocument.c
-sub/gxml/GomElement.c
-sub/gxml/GomHashPairedMap.c
-sub/gxml/GomNode.c
-sub/gxml/GomObject.c
-sub/gxml/GXmlParser.c
-sub/gxml/GomProperty.c
-sub/gxml/GomSchema.c
-sub/gxml/GXmlDocument.c
-sub/gxml/GXmlDomCollections.c
-sub/gxml/GXmlDomRange.c
-sub/gxml/GXmlElement.c
-sub/gxml/GXmlHashMapAttr.c
-sub/gxml/GXmlNode.c
-sub/gxml/GXmlText.c
-sub/gxml/Node.c
-sub/gxml/Parser.c
-sub/gxml/Serializable.c
-sub/gxml/SerializableEnum.c
-sub/gxml/SerializableGeeArrayList.c
-sub/gxml/SerializableGeeDualKeyMap.c
-sub/gxml/SerializableGeeHashMap.c
-sub/gxml/SerializableGeeTreeMap.c
-sub/gxml/SerializableObjectModel.c
-sub/gxml/SerializableProperty.c
-sub/gxml/TDocument.c
-sub/gxml/XParser.c