diff --git a/gxml/GDomCollections.vala b/gxml/GDomCollections.vala
index 57d7d324b53f42a03d8a2c5f3c1dcb6bd26a8bf5..7cc2114027f5053ea392050550c70ecc173cd468 100644
--- a/gxml/GDomCollections.vala
+++ b/gxml/GDomCollections.vala
@@ -25,7 +25,7 @@ using Gee;
 /**
  * DOM4 Setteable token list, powered by libxml2 library.
  */
-public class GXml.GDomSettableTokenList : GXml.GDomTokenList, GXml.DomSettableTokenList {
+public class GXml.GDomSettableTokenList : GXml.TokenList, GXml.DomSettableTokenList {
   public string value {
     owned get  { return to_string (); }
     set {
diff --git a/gxml/GomElement.vala b/gxml/GomElement.vala
index ec8d4a28825802a1b4f869a06e3d91f773cec21b..fd63a34fb233ff5c0e8a82be5d05e04933645d47 100644
--- a/gxml/GomElement.vala
+++ b/gxml/GomElement.vala
@@ -301,7 +301,7 @@ public class GXml.GomElement : GomNode,
    */
   public DomTokenList class_list {
     owned get {
-      return new GDomTokenList (this, "class");
+      return new GXml.TokenList (this, "class");
     }
   }
 
diff --git a/gxml/XElement.vala b/gxml/XElement.vala
index e25b9da677c014bb6ce66de4681ce29244e4b410..ae7fa25afe255738b2c5191cf515e9c2bd13c431 100644
--- a/gxml/XElement.vala
+++ b/gxml/XElement.vala
@@ -216,7 +216,7 @@ public class GXml.XElement : GXml.XNonDocumentChildNode,
   }
   public DomTokenList class_list {
     owned get {
-      return new GDomTokenList (this, "class");
+      return new GXml.TokenList (this, "class");
     }
   }