diff --git a/crates/ty_python_semantic/src/types/diagnostic.rs b/crates/ty_python_semantic/src/types/diagnostic.rs
index a0feda5620..9ae1efef7d 100644
--- a/crates/ty_python_semantic/src/types/diagnostic.rs
+++ b/crates/ty_python_semantic/src/types/diagnostic.rs
@@ -30,7 +30,7 @@ use crate::types::{
     ProtocolInstanceType, SpecialFormType, SubclassOfInner, Type, TypeContext, TypeVarVariance,
     binding_type, protocol_class::ProtocolClass,
 };
-use crate::types::{KnownInstanceType, MemberLookupPolicy, TypedDictType, UnionType};
+use crate::types::{KnownInstanceType, MemberLookupPolicy, TypeVarKind, TypedDictType, UnionType};
 use crate::{Db, DisplaySettings, FxIndexMap, Program, declare_lint};
 use itertools::Itertools;
 use ruff_db::source::source_text;
@@ -5922,17 +5922,19 @@ pub(crate) fn report_shadowed_type_variable<'db>(
     kind: &str,
     name: &ast::name::Name,
     range: TextRange,
-    is_paramspec: bool,
+    type_var_kind: TypeVarKind,
     other_typevar: BoundTypeVarInstance<'db>,
 ) {
     let db = context.db();
     let Some(builder) = context.report_lint(&SHADOWED_TYPE_VARIABLE, range) else {
         return;
     };
-    let typevar_kind = if is_paramspec {
-        "ParamSpec"
-    } else {
-        "type variable"
+    let typevar_kind = match type_var_kind {
+        TypeVarKind::Legacy
+        | TypeVarKind::Pep695
+        | TypeVarKind::TypingSelf
+        | TypeVarKind::Pep613Alias => "type variable",
+        TypeVarKind::ParamSpec | TypeVarKind::Pep695ParamSpec => "ParamSpec",
     };
     let mut diagnostic = builder.into_diagnostic(format_args!(
         "Generic {kind} `{name}` uses {typevar_kind} `{typevar_name}` already bound by an enclosing scope",
diff --git a/crates/ty_python_semantic/src/types/infer/builder/function.rs b/crates/ty_python_semantic/src/types/infer/builder/function.rs
index ebfed70fde..dc8e167d1a 100644
--- a/crates/ty_python_semantic/src/types/infer/builder/function.rs
+++ b/crates/ty_python_semantic/src/types/infer/builder/function.rs
@@ -3,7 +3,7 @@ use crate::{
     reachability::ReachabilityConstraintsExtension,
     types::{
         KnownClass, KnownInstanceType, ParamSpecAttrKind, SubclassOfInner, SubclassOfType, Type,
-        TypeContext, UnionType,
+        TypeContext, TypeVarKind, UnionType,
         diagnostic::{
             FINAL_ON_NON_METHOD, INVALID_PARAMETER_DEFAULT, INVALID_PARAMSPEC, INVALID_TYPE_FORM,
             USELESS_OVERLOAD_BODY, add_type_expression_reference_link,
@@ -434,13 +434,19 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
                 let param_name = type_param.name();
                 for enclosing in enclosing_generic_contexts(db, self.index, current_scope) {
                     if let Some(other_typevar) = enclosing.binds_named_typevar(db, &param_name.id) {
+                        let kind = match type_param {
+                            ast::TypeParam::TypeVar(_) => TypeVarKind::Pep695,
+                            ast::TypeParam::ParamSpec(_) => TypeVarKind::Pep695ParamSpec,
+                            // TODO: should be `TypeVarKind::Pep695TypeVarTuple`
+                            ast::TypeParam::TypeVarTuple(_) => TypeVarKind::Pep695,
+                        };
                         report_shadowed_type_variable(
                             &self.context,
                             &param_name.id,
                             "function",
                             &function.name.id,
                             function.name.range(),
-                            matches!(type_param, ast::TypeParam::ParamSpec(_)),
+                            kind,
                             other_typevar,
                         );
                     }
diff --git a/crates/ty_python_semantic/src/types/infer/builder/post_inference/static_class.rs b/crates/ty_python_semantic/src/types/infer/builder/post_inference/stat
ic_class.rs
index 8876a9d4c1..331db86836 100644
--- a/crates/ty_python_semantic/src/types/infer/builder/post_inference/static_class.rs
+++ b/crates/ty_python_semantic/src/types/infer/builder/post_inference/static_class.rs
@@ -861,7 +861,7 @@ pub(crate) fn check_static_class_definitions<'db>(
                                 "class",
                                 &class_node.name.id,
                                 class.header_range(db),
-                                self_typevar.is_paramspec(db),
+                                self_typevar.kind(db),
                                 other_typevar,
                             );
                         }
@@ -881,7 +881,7 @@ pub(crate) fn check_static_class_definitions<'db>(
                             "class",
                             &class_node.name.id,
                             class.header_range(db),
-                            base_typevar.is_paramspec(db),
+                            base_typevar.kind(db),
                             other_typevar,
                         );
                     }