diff --git a/jedi/plugins/typeshed.py b/jedi/plugins/typeshed.py
index 0384171d..8c146ba2 100644
--- a/jedi/plugins/typeshed.py
+++ b/jedi/plugins/typeshed.py
@@ -82,7 +82,7 @@ def _merge_modules(context_set, stub_context):
     for context in context_set:
         # TODO what about compiled?
         if isinstance(context, ModuleContext):
-            yield ModuleStubContext(
+            yield StubModuleContext(
                 context.evaluator,
                 stub_context,
                 context.tree_node,
@@ -123,7 +123,7 @@ class TypeshedPlugin(BasePlugin):
                 evaluator,
                 import_names,
                 parent_module_context.actual_context  # noqa
-                    if isinstance(parent_module_context, ModuleStubContext)
+                    if isinstance(parent_module_context, StubModuleContext)
                     else parent_module_context,
                 sys_path
             )
@@ -131,7 +131,7 @@ class TypeshedPlugin(BasePlugin):
             map_ = None
             if len(import_names) == 1 and import_name != 'typing':
                 map_ = self._cache_stub_file_map(evaluator.grammar.version_info)
-            elif isinstance(parent_module_context, ModuleStubContext):
+            elif isinstance(parent_module_context, StubModuleContext):
                 map_ = _merge_create_stub_map(parent_module_context.py__path__())
 
             if map_ is not None:
@@ -194,7 +194,7 @@ class StubName(TreeNameDefinition):
                     )
                 elif isinstance(stub_context, ClassContext) \
                         and isinstance(actual_context, ClassContext):
-                    yield ClassStubContext(
+                    yield StubClassContext(
                         actual_context.evaluator,
                         stub_context,
                         actual_context.parent_context,
@@ -281,11 +281,11 @@ class _StubContextFilterMixin(_MixedStubContextMixin):
             yield f
 
 
-class ModuleStubContext(_StubContextFilterMixin, ModuleContext):
+class StubModuleContext(_StubContextFilterMixin, ModuleContext):
     pass
 
 
-class ClassStubContext(_StubContextFilterMixin, ClassContext):
+class StubClassContext(_StubContextFilterMixin, ClassContext):
     pass
 
 
diff --git a/test/test_plugin/test_stub.py b/test/test_plugin/test_stub.py
index 3122239e..e5c8ce91 100644
--- a/test/test_plugin/test_stub.py
+++ b/test/test_plugin/test_stub.py
@@ -41,31 +41,31 @@ def test_function(Script):
     code = 'import threading; threading.current_thread'
     def_, = Script(code).goto_definitions()
     context = def_._name._context
-    assert isinstance(context, typeshed.FunctionStubContext), context
+    assert isinstance(context, typeshed.StubFunctionContext), context
 
     def_, = Script(code + '()').goto_definitions()
     context = def_._name._context
     assert isinstance(context, TreeInstance)
-    assert isinstance(context.class_context, typeshed.ClassStubContext), context
+    assert isinstance(context.class_context, typeshed.StubClassContext), context
 
 
 def test_class(Script):
     def_, = Script('import threading; threading.Thread').goto_definitions()
     context = def_._name._context
-    assert isinstance(context, typeshed.ClassStubContext), context
+    assert isinstance(context, typeshed.StubClassContext), context
 
 
 def test_instance(Script):
     def_, = Script('import threading; threading.Thread()').goto_definitions()
     context = def_._name._context
     assert isinstance(context, TreeInstance)
-    assert isinstance(context.class_context, typeshed.ClassStubContext), context
+    assert isinstance(context.class_context, typeshed.StubClassContext), context
 
 
 def test_class_function(Script):
     def_, = Script('import threading; threading.Thread.getName').goto_definitions()
     context = def_._name._context
-    assert isinstance(context, typeshed.FunctionStubContext), context
+    assert isinstance(context, typeshed.StubFunctionContext), context
 
 
 def test_method(Script):
@@ -73,7 +73,7 @@ def test_method(Script):
     def_, = Script(code).goto_definitions()
     context = def_._name._context
     assert isinstance(context, BoundMethod), context
-    assert isinstance(context._function, typeshed.FunctionStubContext), context
+    assert isinstance(context._function, typeshed.StubFunctionContext), context
 
     def_, = Script(code + '()').goto_definitions()
     context = def_._name._context