diff --git a/gxml/Collections.vala b/gxml/Collections.vala
index d39b8e8c7df2cc82a9ca29dad7e293d6be0fb426..cb2ade71ea42e94f979286d128c3ebf551a28cee 100644
--- a/gxml/Collections.vala
+++ b/gxml/Collections.vala
@@ -41,7 +41,7 @@ public interface GXml.MappeableElement : Object, DomElement {
 /**
  * {@link Gee.Iterable} and {@link Gee.Traversable} implementation of {@link GomCollection}
  */
-public interface GXml.GomMap : Object, GomCollection, Traversable<DomElement>, Iterable<DomElement> {
+public interface GXml.Map : Object, GomCollection, Traversable<DomElement>, Iterable<DomElement> {
   /**
    * An attribute's name in items to be added and used to retrieve elements
    * as key.
diff --git a/gxml/GomCollections.vala b/gxml/GomCollections.vala
index 09880965ebbe050febba6c748ea8dbb3f6b5ffb3..ba3e782d0af5c8565d02b324f5e9b9abeadc68d1 100644
--- a/gxml/GomCollections.vala
+++ b/gxml/GomCollections.vala
@@ -381,7 +381,7 @@ public class GXml.GomArrayList : GXml.BaseCollection, GXml.List {
  *   }
  * }}}
  */
-public class GXml.GomHashMap : GXml.BaseCollection, GomMap {
+public class GXml.GomHashMap : GXml.BaseCollection, GXml.Map {
   /**
    * A hashtable with all keys as string to node's index refered. Don't modify it manually.
    */
diff --git a/gxml/GomElement.vala b/gxml/GomElement.vala
index 3fd3f7af27c8309bcb332ed918fca84dd2a41a37..233b5f483b69faf63166dd26bd924010928c04d3 100644
--- a/gxml/GomElement.vala
+++ b/gxml/GomElement.vala
@@ -375,7 +375,7 @@ public class GXml.GomElement : GomNode,
     public DomNode? item (int index) {
       if (index < 0 || index >= size) return null;
       long i = -1;
-      foreach (Map.Entry<long,string> e in order.ascending_entries) {
+      foreach (Gee.Map.Entry<long,string> e in order.ascending_entries) {
         i++;
         if (i == index) {
           string name = e.value;
@@ -557,7 +557,7 @@ public class GXml.GomElement : GomNode,
     }
     private long index_of (string name) {
       long i = -1;
-      foreach (Map.Entry<long,string> e in order.ascending_entries) {
+      foreach (Gee.Map.Entry<long,string> e in order.ascending_entries) {
         i++;
         if (e.value == name) return i;
       }