diff --git a/gxml/GXmlDocument.vala b/gxml/GXmlDocument.vala
index a3dbd69ab58e8130a5e1d08738603f9af2952863..da5e58cf894c826bf0039af82ee2af943543b54e 100644
--- a/gxml/GXmlDocument.vala
+++ b/gxml/GXmlDocument.vala
@@ -242,7 +242,7 @@ public class GXml.GDocument : GXml.GNode,
   }
   public DomComment GXml.DomDocument.create_comment (string data) throws GLib.Error {
     var c = doc->new_comment (data);
-    return new GComment (this, c);
+    return new XComment (this, c);
   }
   public DomProcessingInstruction create_processing_instruction (string target, string data) throws GLib.Error {
       return (DomProcessingInstruction) create_pi (target, data);
diff --git a/gxml/GXmlNode.vala b/gxml/GXmlNode.vala
index c0d86d89561d76775545121a9d61411bfff7bf4d..a7d03600440eafea4022b8bb22af3c73afdd0c78 100644
--- a/gxml/GXmlNode.vala
+++ b/gxml/GXmlNode.vala
@@ -110,7 +110,7 @@ public abstract class GXml.GNode : Object,
       case GXml.NodeType.PROCESSING_INSTRUCTION:
         return new GProcessingInstruction (doc, node);
       case GXml.NodeType.COMMENT:
-        return new GComment (doc, node);
+        return new XComment (doc, node);
       case GXml.NodeType.DOCUMENT:
         return new GDocument.from_doc (node->doc);
       case GXml.NodeType.DOCUMENT_TYPE:
diff --git a/gxml/GXmlComment.vala b/gxml/XComment.vala
similarity index 90%
rename from gxml/GXmlComment.vala
rename to gxml/XComment.vala
index 19463273950b84fd0c9a096eb5cff194536bc3a4..119320de9cf0b1283f34ff36c098b87c6b60dd5d 100644
--- a/gxml/GXmlComment.vala
+++ b/gxml/XComment.vala
@@ -24,9 +24,9 @@ using Gee;
 /**
  * DOM4 Class implemeting {@link GXml.Comment} and {@link GXml.DomComment} interface, powered by libxml2 library.
  */
-public class GXml.GComment : GXml.XCharacterData, GXml.DomComment
+public class GXml.XComment : GXml.XCharacterData, GXml.DomComment
 {
-  public GComment (GDocument doc, Xml.Node *node)
+  public XComment (GDocument doc, Xml.Node *node)
   {
     _node = node;
     _doc = doc;
diff --git a/gxml/meson.build b/gxml/meson.build
index 7f156acf75bd261e36d51652913a6a9af628b3df..10888eaf47713cec34ddae358d087bfb817ac138 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -65,7 +65,6 @@ valasources = files ([
 	'GomStringRef.vala',
 	'GomText.vala',
 	'GXmlChildNode.vala',
-	'GXmlComment.vala',
 	'GXmlDocument.vala',
 	'GXmlDomCollections.vala',
 	'GXmlDomEvents.vala',
@@ -85,6 +84,7 @@ valasources = files ([
 	'Schema.vala',
 	'XAttribute.vala',
 	'XCharacter.vala',
+	'XComment.vala',
 	'XHashMapAttr.vala',
 	'XParser.vala',
 	'XPath.vala',