Rename 'unicode' to 'str' in its tp_name field. Rename 'str' to 'str8'.
Change all occurrences of unichr to chr.
diff --git a/Lib/test/test_ucn.py b/Lib/test/test_ucn.py
index 4472e90..485e124 100644
--- a/Lib/test/test_ucn.py
+++ b/Lib/test/test_ucn.py
@@ -96,7 +96,7 @@
         import unicodedata
         count = 0
         for code in xrange(0x10000):
-            char = unichr(code)
+            char = chr(code)
             name = unicodedata.name(char, None)
             if name is not None:
                 self.assertEqual(unicodedata.lookup(name), char)