diff --git a/stdlib/3/unicodedata.pyi b/stdlib/3/unicodedata.pyi
index 07b5c4774..b9ff64e41 100644
--- a/stdlib/3/unicodedata.pyi
+++ b/stdlib/3/unicodedata.pyi
@@ -1,37 +1,36 @@
 # Stubs for unicodedata (Python 3.4)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
+from typing import Any, TypeVar, Union
 
-from typing import Any
-
-ucd_3_2_0 = ...  # type: Any
+ucd_3_2_0 = ...  # type: UCD
 ucnhash_CAPI = ...  # type: Any
 unidata_version = ...  # type: str
 
-def bidirectional(unichr): ...
-def category(unichr): ...
-def combining(unichr): ...
-def decimal(chr, default=...): ...
-def decomposition(unichr): ...
-def digit(chr, default=...): ...
-def east_asian_width(unichr): ...
-def lookup(name): ...
-def mirrored(unichr): ...
-def name(chr, default=...): ...
-def normalize(form, unistr): ...
-def numeric(chr, default=...): ...
+_default = TypeVar('_default')
+
+def bidirectional(__chr: str) -> str: ...
+def category(__chr: str) -> str: ...
+def combining(__chr: str) -> int: ...
+def decimal(__chr: str, __default: _default=...) -> Union[int, _default]: ...
+def decomposition(__chr: str) -> str: ...
+def digit(__chr: str, __default: _default=...) -> Union[int, _default]: ...
+def east_asian_width(__chr: str) -> str: ...
+def lookup(__name: Union[str, bytes]) -> str: ...
+def mirrored(__chr: str) -> int: ...
+def name(__chr: str, __default: _default=...) -> Union[str, _default]: ...
+def normalize(__form: str, __unistr: str) -> str: ...
+def numeric(__chr: str, __default: _default=...) -> Union[float, _default]: ...
 
 class UCD:
-    unidata_version = ...  # type: Any
-    def bidirectional(self, unichr): ...
-    def category(self, unichr): ...
-    def combining(self, unichr): ...
-    def decimal(self, chr, default=...): ...
-    def decomposition(self, unichr): ...
-    def digit(self, chr, default=...): ...
-    def east_asian_width(self, unichr): ...
-    def lookup(self, name): ...
-    def mirrored(self, unichr): ...
-    def name(self, chr, default=...): ...
-    def normalize(self, form, unistr): ...
-    def numeric(self, chr, default=...): ...
+    unidata_version = ...  # type: str
+    def bidirectional(self, __chr: str) -> str: ...
+    def category(self, __chr: str) -> str: ...
+    def combining(self, __chr: str) -> int: ...
+    def decimal(self, __chr: str, __default: _default=...) -> Union[int, _default]: ...
+    def decomposition(self, __chr: str) -> str: ...
+    def digit(self, __chr: str, __default: _default=...) -> Union[int, _default]: ...
+    def east_asian_width(self, __chr: str) -> str: ...
+    def lookup(self, __name: Union[str, bytes]) -> str: ...
+    def mirrored(self, __chr: str) -> int: ...
+    def name(self, __chr: str, __default: _default=...) -> Union[str, _default]: ...
+    def normalize(self, __form: str, __unistr: str) -> str: ...
+    def numeric(self, __chr: str, __default: _default=...) -> Union[float, _default]: ...