diff --git a/CHANGELOG.md b/CHANGELOG.md
index 705bbf46f29930cae94c353d72121408278e9417..5606996a65f76e2244e4b74d1eb83b49330632cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Change log
 
+ * Large refactor of XML schema compiler
+ 
 * 0.92:
 
  * Added `on_fail` event handler - fired upon connection loss
diff --git a/coolamqp/framing/compilation/xml_fields.py b/coolamqp/framing/compilation/xml_fields.py
index 7b395a0eca8800843df7ee29a489f4eef4bf9efe..18d7cb376428932fdf427fb6e6aab9f79f33e9a3 100644
--- a/coolamqp/framing/compilation/xml_fields.py
+++ b/coolamqp/framing/compilation/xml_fields.py
@@ -78,7 +78,7 @@ def get_docs(elem, label=False):
     if label:
         return elem.attrib.get('label', None)
 
-_name = _SimpleField('name', unicode)
+_name = _SimpleField('name', six.text_type)
 _docs = _ComputedField('docs', lambda elem: get_docs(elem))