diff --git a/stdlib/3/email/contentmanager.pyi b/stdlib/3/email/contentmanager.pyi
index 6f37fbabd..6b1f2d12f 100644
--- a/stdlib/3/email/contentmanager.pyi
+++ b/stdlib/3/email/contentmanager.pyi
@@ -2,14 +2,10 @@
 
 from typing import Any, Callable
 import sys
-import email.message
 from email.message import Message
 
 if sys.version_info >= (3, 4):
 
-    EmailMessage = email.message.EmailMessage
-    MIMEPart = email.message.MIMEPart
-
     class ContentManager:
         def __init__(self) -> None: ...
         def get_content(self, msg: Message, *args: Any, **kw: Any) -> Any: ...
diff --git a/stdlib/3/email/headerregistry.pyi b/stdlib/3/email/headerregistry.pyi
index a39f0e21a..b20ddbe90 100644
--- a/stdlib/3/email/headerregistry.pyi
+++ b/stdlib/3/email/headerregistry.pyi
@@ -1,6 +1,6 @@
 # Stubs for email.headerregistry (Python 3.4)
 
-import datetime as dt
+from datetime import datetime as _datetime
 import sys
 from typing import Dict, Tuple, Optional, Any, Union, Mapping
 from email.errors import MessageDefect
@@ -27,9 +27,9 @@ if sys.version_info >= (3, 3):
     class UniqueUnstructuredHeader(UnstructuredHeader): ...
 
     class DateHeader:
-        datetime = ...  # type: dt.datetime
+        datetime = ...  # type: _datetime
         @classmethod
-        def parse(cls, string: Union[str, dt.datetime],
+        def parse(cls, string: Union[str, _datetime],
                   kwds: Dict[str, Any]) -> None: ...
 
     class UniqueDateHeader(DateHeader): ...
@@ -68,7 +68,7 @@ if sys.version_info >= (3, 3):
     class ContentDispositionHeader(ParameterizedMIMEHeader):
         content_disposition = ...  # type: str
 
-    class ContentTransferEncoding:
+    class ContentTransferEncodingHeader:
         cte = ...  # type: str
         @classmethod
         def parse(cls, string: str, kwds: Dict[str, Any]) -> None: ...