diff --git a/gxml/GomDocument.vala b/gxml/GomDocument.vala
index 450cbc07cd2630ed54ecd46c5575bd6d3885ceef..4b948b03a45ffffc1bbc4bf26130244703eef359 100644
--- a/gxml/GomDocument.vala
+++ b/gxml/GomDocument.vala
@@ -288,7 +288,7 @@ public class GXml.GomDocument : GomNode,
   }
 
   public DomRange create_range() {
-      return new GDomRange (this);
+      return new GXml.Range (this);
   }
 
   // NodeFilter.SHOW_ALL = 0xFFFFFFFF
diff --git a/gxml/GDomRange.vala b/gxml/Range.vala
similarity index 98%
rename from gxml/GDomRange.vala
rename to gxml/Range.vala
index 3be7357d4163ebd61e8642e815ea123fb095d85e..51b6e982c6b1672bb9149bf2798008c2274de223 100644
--- a/gxml/GDomRange.vala
+++ b/gxml/Range.vala
@@ -24,7 +24,7 @@
 /**
  * DOM4 Range implementation, powered by libxml2 library.
  */
-public class GXml.GDomRange : Object, GXml.DomRange {
+public class GXml.Range : Object, GXml.DomRange {
 	protected DomDocument _document;
 	protected DomNode _start_container;
 	protected int _start_offset;
@@ -39,7 +39,7 @@ public class GXml.GDomRange : Object, GXml.DomRange {
 	public bool collapsed { get { return _collapse; } }
 	public DomNode common_ancestor_container { get { return _common_ancestor_container; } }
 
-	public GDomRange (DomDocument doc) {
+	public Range (DomDocument doc) {
 		_document = doc;
 		_start_container = doc;
 		_end_container = doc;
diff --git a/gxml/XDocument.vala b/gxml/XDocument.vala
index 9c709b814bf875c140f95508681dee03530940e8..54d09b63a62ee6401493898ae1f23140e2cfe1c7 100644
--- a/gxml/XDocument.vala
+++ b/gxml/XDocument.vala
@@ -307,7 +307,7 @@ public class GXml.XDocument : GXml.XNode,
   }
 
   public DomRange create_range() {
-      return new GDomRange (this);
+      return new GXml.Range (this);
   }
 
   // NodeFilter.SHOW_ALL = 0xFFFFFFFF
diff --git a/gxml/meson.build b/gxml/meson.build
index 996b22ec402eca8d003fe51d303b5eeae04a9ceb..6ff93bb123fb8864d61bb7915af8e5e5a58a3f71 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -50,7 +50,6 @@ valasources = files ([
 	'DomRange.vala',
 	'Enumeration.vala',
 	'Event.vala',
-	'GDomRange.vala',
 	'GomArrayList.vala',
 	'GomAttr.vala',
 	'GomBaseCollection.vala',
@@ -70,6 +69,7 @@ valasources = files ([
 	'LXPathObject.vala',
 	'NodeType.vala',
 	'Parser.vala',
+	'Range.vala',
 	'SettableTokenList.vala',
 	'Schema.vala',
 	'TokenList.vala',