diff --git a/mypy/checkpattern.py b/mypy/checkpattern.py
--- a/mypy/checkpattern.py
+++ b/mypy/checkpattern.py
@@ -396,8 +396,7 @@ def visit_mapping_pattern(self, o: MappingPattern) -> PatternType:
             if is_subtype(current_type, mapping) and isinstance(current_type, Instance):
                 mapping_inst = map_instance_to_supertype(current_type, mapping.type)
                 dict_typeinfo = self.chk.lookup_typeinfo("builtins.dict")
-                dict_type = fill_typevars(dict_typeinfo)
-                rest_type = expand_type_by_instance(dict_type, mapping_inst)
+                rest_type = Instance(dict_typeinfo, mapping_inst.args)
             else:
                 object_type = self.chk.named_type("builtins.object")
                 rest_type = self.chk.named_generic_type("builtins.dict",
diff --git a/mypy/semanal.py b/mypy/semanal.py
--- a/mypy/semanal.py
+++ b/mypy/semanal.py
@@ -1116,7 +1116,8 @@ def check_decorated_function_is_method(self, decorator: str,
     def visit_class_def(self, defn: ClassDef) -> None:
         self.statement = defn
         self.incomplete_type_stack.append(not defn.info)
-        with self.tvar_scope_frame(self.tvar_scope.class_frame()):
+        namespace = self.qualified_name(defn.name)
+        with self.tvar_scope_frame(self.tvar_scope.class_frame(namespace)):
             self.analyze_class(defn)
         self.incomplete_type_stack.pop()
 
diff --git a/mypy/tvar_scope.py b/mypy/tvar_scope.py
--- a/mypy/tvar_scope.py
+++ b/mypy/tvar_scope.py
@@ -1,5 +1,5 @@
 from typing import Optional, Dict, Union
-from mypy.types import TypeVarLikeType, TypeVarType, ParamSpecType, ParamSpecFlavor
+from mypy.types import TypeVarLikeType, TypeVarType, ParamSpecType, ParamSpecFlavor, TypeVarId
 from mypy.nodes import ParamSpecExpr, TypeVarExpr, TypeVarLikeExpr, SymbolTableNode
 
 
@@ -12,7 +12,8 @@ class TypeVarLikeScope:
     def __init__(self,
                  parent: 'Optional[TypeVarLikeScope]' = None,
                  is_class_scope: bool = False,
-                 prohibited: 'Optional[TypeVarLikeScope]' = None) -> None:
+                 prohibited: 'Optional[TypeVarLikeScope]' = None,
+                 namespace: str = '') -> None:
         """Initializer for TypeVarLikeScope
 
         Parameters:
@@ -27,6 +28,7 @@ def __init__(self,
         self.class_id = 0
         self.is_class_scope = is_class_scope
         self.prohibited = prohibited
+        self.namespace = namespace
         if parent is not None:
             self.func_id = parent.func_id
             self.class_id = parent.class_id
@@ -51,22 +53,25 @@ def method_frame(self) -> 'TypeVarLikeScope':
         """A new scope frame for binding a method"""
         return TypeVarLikeScope(self, False, None)
 
-    def class_frame(self) -> 'TypeVarLikeScope':
+    def class_frame(self, namespace: str) -> 'TypeVarLikeScope':
         """A new scope frame for binding a class. Prohibits *this* class's tvars"""
-        return TypeVarLikeScope(self.get_function_scope(), True, self)
+        return TypeVarLikeScope(self.get_function_scope(), True, self, namespace=namespace)
 
     def bind_new(self, name: str, tvar_expr: TypeVarLikeExpr) -> TypeVarLikeType:
         if self.is_class_scope:
             self.class_id += 1
             i = self.class_id
+            namespace = self.namespace
         else:
             self.func_id -= 1
             i = self.func_id
+            # TODO: Consider also using namespaces for functions
+            namespace = ''
         if isinstance(tvar_expr, TypeVarExpr):
             tvar_def: TypeVarLikeType = TypeVarType(
                 name,
                 tvar_expr.fullname,
-                i,
+                TypeVarId(i, namespace=namespace),
                 values=tvar_expr.values,
                 upper_bound=tvar_expr.upper_bound,
                 variance=tvar_expr.variance,
diff --git a/mypy/types.py b/mypy/types.py
--- a/mypy/types.py
+++ b/mypy/types.py
@@ -416,9 +416,15 @@ class TypeVarId:
     # Class variable used for allocating fresh ids for metavariables.
     next_raw_id: ClassVar[int] = 1
 
-    def __init__(self, raw_id: int, meta_level: int = 0) -> None:
+    # Fullname of class (or potentially function in the future) which
+    # declares this type variable (not the fullname of the TypeVar
+    # definition!), or ''
+    namespace: str
+
+    def __init__(self, raw_id: int, meta_level: int = 0, *, namespace: str = '') -> None:
         self.raw_id = raw_id
         self.meta_level = meta_level
+        self.namespace = namespace
 
     @staticmethod
     def new(meta_level: int) -> 'TypeVarId':
@@ -432,7 +438,8 @@ def __repr__(self) -> str:
     def __eq__(self, other: object) -> bool:
         if isinstance(other, TypeVarId):
             return (self.raw_id == other.raw_id and
-                    self.meta_level == other.meta_level)
+                    self.meta_level == other.meta_level and
+                    self.namespace == other.namespace)
         else:
             return False
 
@@ -440,7 +447,7 @@ def __ne__(self, other: object) -> bool:
         return not (self == other)
 
     def __hash__(self) -> int:
-        return hash((self.raw_id, self.meta_level))
+        return hash((self.raw_id, self.meta_level, self.namespace))
 
     def is_meta_var(self) -> bool:
         return self.meta_level > 0
@@ -514,6 +521,7 @@ def serialize(self) -> JsonDict:
                 'name': self.name,
                 'fullname': self.fullname,
                 'id': self.id.raw_id,
+                'namespace': self.id.namespace,
                 'values': [v.serialize() for v in self.values],
                 'upper_bound': self.upper_bound.serialize(),
                 'variance': self.variance,
@@ -525,7 +533,7 @@ def deserialize(cls, data: JsonDict) -> 'TypeVarType':
         return TypeVarType(
             data['name'],
             data['fullname'],
-            data['id'],
+            TypeVarId(data['id'], namespace=data['namespace']),
             [deserialize_type(v) for v in data['values']],
             deserialize_type(data['upper_bound']),
             data['variance'],

diff --git a/test-data/unit/check-selftype.test b/test-data/unit/check-selftype.test
--- a/test-data/unit/check-selftype.test
+++ b/test-data/unit/check-selftype.test
@@ -893,11 +893,14 @@ from typing import Generic, TypeVar, Tuple
 T = TypeVar('T')
 S = TypeVar('S')
 U = TypeVar('U')
+V = TypeVar('V')
 
 class C(Generic[T]):
     def magic(self: C[Tuple[S, U]]) -> Tuple[T, S, U]: ...
 
-reveal_type(C[Tuple[int, str]]().magic())  # N: Revealed type is "Tuple[Tuple[builtins.int, builtins.str], builtins.int, builtins.str]"
+class D(Generic[V]):
+    def f(self) -> None:
+        reveal_type(C[Tuple[V, str]]().magic())  # N: Revealed type is "Tuple[Tuple[V`1, builtins.str], V`1, builtins.str]"
 [builtins fixtures/tuple.pyi]
 
 [case testSelfTypeOnUnion]
@@ -1167,3 +1170,29 @@ def build_wrapper_non_gen(descriptor: Descriptor[int]) -> BaseWrapper[str]:
 def build_sub_wrapper_non_gen(descriptor: Descriptor[int]) -> SubWrapper[str]:
     return SubWrapper.create_wrapper(descriptor)  # E: Argument 1 to "create_wrapper" of "BaseWrapper" has incompatible type "Descriptor[int]"; expected "Descriptor[str]"
 [builtins fixtures/classmethod.pyi]
+
+[case testSelfTypeInGenericClassUsedFromAnotherGenericClass1]
+from typing import TypeVar, Generic, Iterator, List, Tuple
+
+_T_co = TypeVar("_T_co", covariant=True)
+_T1 = TypeVar("_T1")
+_T2 = TypeVar("_T2")
+S = TypeVar("S")
+
+class Z(Iterator[_T_co]):
+    def __new__(cls,
+                __iter1: List[_T1],
+                __iter2: List[_T2]) -> Z[Tuple[_T1, _T2]]: ...
+    def __iter__(self: S) -> S: ...
+    def __next__(self) -> _T_co: ...
+
+T = TypeVar('T')
+
+class C(Generic[T]):
+    a: List[T]
+    b: List[str]
+
+    def f(self) -> None:
+        for x, y in Z(self.a, self.b):
+            reveal_type((x, y))  # N: Revealed type is "Tuple[T`1, builtins.str]"
+[builtins fixtures/tuple.pyi]

Invalid type inference for zip in a generic class
The inferred type is wrong here, after the recent typeshed sync:
```py
from typing import TypeVar, Generic, List

T = TypeVar('T')

class C(Generic[T]):
    a: List[T]
    b: List[str]

    def f(self) -> None:
        for x, y in zip(self.a, self.b):
            reveal_type((x, y))  # Tuple[Tuple[T`1, builtins.str], builtins.str]
```

The correct type would be `Tuple[T, builtins.str]`.

Here's a self-contained example that doesn't depend on typeshed:
```py
from typing import TypeVar, Generic, Iterator, List, Tuple

_T_co = TypeVar("_T_co", covariant=True)
_T1 = TypeVar("_T1")
_T2 = TypeVar("_T2")
S = TypeVar("S")

class Z(Iterator[_T_co]):
    def __new__(cls,
                __iter1: List[_T1],
                __iter2: List[_T2]) -> Z[Tuple[_T1, _T2]]: ...
    def __iter__(self: S) -> S: ...
    def __next__(self) -> _T_co: ...

T = TypeVar('T')

class C(Generic[T]):
    a: List[T]
    b: List[str]

    def f(self) -> None:
        for x, y in Z(self.a, self.b):
            reveal_type((x, y))  # Tuple[Tuple[T`1, builtins.str], builtins.str]
```

The behavior is correct if we avoid using a self type with `__iter__`:
```py
    def __iter__(self) -> Z[_T_co]: ...
```

This happens with some frequency in an internal codebase so this seems important to fix.

I think that this is caused by confusion between type variables of different classes (`_T_co` vs `T`) that share the same type variable id. A potential fix for this could be to give each class type variable a unique ID. This way there shouldn't be any confusion. 

This would probably also imply updating the type to string conversion logic to not include type variable ids (currently shown as ``T`<id>``). I don't think that the best option is to just drop the type variable ids from messages, since there can be multiple logically separate type variables with the same name. One option would be to use `T`, `T'`, `T''` instead of ``T`1``, ``T`2``, etc. (where the first type variable with short name X doesn't get a prime, the second one gets a single prime, etc.).
mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeGeneric mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeInstance mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeClass mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeRecursiveBinding mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeOverride mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeStaticAccess mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeNonsensical mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeBound mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeSuper mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeReturn mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeLambdaDefault mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeClone mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeNew mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeRestrictedClassMethod mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeProperSupertypeAttributeMeta mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypePropertyUnion mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeRestrictedMethodOverloadInit mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeProperSupertypeAttributeGeneric mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeRestrictedMethodOverload mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeProperSupertypeAttribute mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeRestrictedMethodOverloadInitFallBacks mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeRestrictedMethod mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeProperSupertypeAttributeTuple mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeRestrictedMethodOverloadInitBadTypeNoCrash mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeRestrictedMethodOverloadFallback mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeNarrowBinding mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeStructureMetaclassMatch mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testBadClassLevelDecoratorHack mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeReallyTrickyExample mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeMutuallyExclusiveRestrictions mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeTrickyExample mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeProtocolMetaclassMatch mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testMixinAllowedWithProtocol mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testUnionPropertyField mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeNotSelfType mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeProtocolClassmethodMatch mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeNoTypeVars mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeNoTypeVarsRestrict mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeOnUnionClassMethod mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeOnUnion mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeClassMethodOnUnionGeneric mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::SelfTypeOverloadedClassMethod mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeClassMethodOnUnionList mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeBadTypeIgnoredInConstructor mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeClassMethodOverloadedOnInstance mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeClassMethodOnUnion mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeBadTypeIgnoredInConstructorGeneric mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeBadTypeIgnoredInConstructorOverload mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeBadTypeIgnoredInConstructorAbstract mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeGenericClassNoClashInstanceMethod mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeGenericClassNoClashClassMethod mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeGenericClassNoClashClassMethodClassObject
mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeMultipleTypeVars mypy/test/testcheck.py::TypeCheckSuite::check-selftype.test::testSelfTypeInGenericClassUsedFromAnotherGenericClass1