diff --git a/pysollib/kpat_load_save.py b/pysollib/kpat_load_save.py
index fac9a52a..8ca37493 100644
--- a/pysollib/kpat_load_save.py
+++ b/pysollib/kpat_load_save.py
@@ -11,8 +11,8 @@
 """
 
 
-class KpatEmitter:
-    """docstring for KpatEmitter"""
+class KpatXmlEmitter:
+    """docstring for KpatXmlEmitter"""
     def _ind_out(self, text):
         """docstring for _out"""
         self._out("\t" * self._indent)
diff --git a/tests/lib/pysol_tests/kpat_load_save.py b/tests/lib/pysol_tests/kpat_load_save.py
index 836a9086..1e62e5ca 100644
--- a/tests/lib/pysol_tests/kpat_load_save.py
+++ b/tests/lib/pysol_tests/kpat_load_save.py
@@ -1,7 +1,7 @@
 # Written by Shlomi Fish, under the MIT Expat License.
 import unittest
 
-from pysollib.kpat_load_save import KpatEmitter
+from pysollib.kpat_load_save import KpatXmlEmitter
 
 from six.moves import cStringIO
 
@@ -9,7 +9,7 @@ from six.moves import cStringIO
 class MyTests(unittest.TestCase):
     def test_emitter(self):
         f = cStringIO()
-        e = KpatEmitter(f)
+        e = KpatXmlEmitter(f)
         self.assertTrue(e)
         e.writeEmptyTag("foo", [("one", "val1"), ("two", "val2")])
         self.assertEqual(
@@ -17,7 +17,7 @@ class MyTests(unittest.TestCase):
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
             + "<foo one=\"val1\" two=\"val2\"/>\n")
         f = cStringIO()
-        e = KpatEmitter(f)
+        e = KpatXmlEmitter(f)
         self.assertTrue(e)
         e.writeStartTag("foo", [("one", "val1"), ("two", "val2")])
         e.writeEmptyTag("flutter", [])