diff --git a/misc/codegen/generators/qlgen.py b/misc/codegen/generators/qlgen.py
index e42c9d015522..96174109ce3d 100755
--- a/misc/codegen/generators/qlgen.py
+++ b/misc/codegen/generators/qlgen.py
@@ -64,6 +64,7 @@ class NoClasses(Error):
     "int": "integer",
     "var": "variable",
     "ref": "reference",
+    "pat": "pattern",
 }
 
 abbreviations.update({f"{k}s": f"{v}s" for k, v in abbreviations.items()})
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index c4be6312e6a2..3fe918a4c3eb 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -15,16 +15,15 @@ fn project_root() -> PathBuf {
 }
 
 fn class_name(type_name: &str) -> String {
-    let name = match type_name {
-        "BinExpr" => "BinaryExpr",
-        "ElseBranch" => "Expr",
-        "Fn" => "Function",
-        "Literal" => "LiteralExpr",
-        "Type" => "TypeRef",
-        "ArrayExpr" => "ArrayExprInternal",
-        _ => type_name,
-    };
-    name.to_owned()
+    match type_name {
+        "BinExpr" => "BinaryExpr".to_owned(),
+        "ElseBranch" => "Expr".to_owned(),
+        "Fn" => "Function".to_owned(),
+        "Literal" => "LiteralExpr".to_owned(),
+        "ArrayExpr" => "ArrayExprInternal".to_owned(),
+        _ if type_name.ends_with("Type") => format!("{}Repr", type_name),
+        _ => type_name.to_owned(),
+    }
 }
 
 fn property_name(type_name: &str, field_name: &str) -> String {
@@ -35,6 +34,8 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         ("Path", "segment") => "part",
         (_, "then_branch") => "then",
         (_, "else_branch") => "else_",
+        ("ArrayType", "ty") => "element_type_repr",
+        (_, "ty") => "type_repr",
         _ => field_name,
     };
     name.to_owned()
diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index c1c9196eacdd..5ae8000953f3 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs 761143f6f40632476e4bdddb66814720a4fa4b3b655ebad3ea2bfa35161f5ce8 761143f6f40632476e4bdddb66814720a4fa4b3b655ebad3ea2bfa35161f5ce8
+top.rs aad41fc41df08b35aeca0700426e38538c23aef9030b42aeaac964dced524575 aad41fc41df08b35aeca0700426e38538c23aef9030b42aeaac964dced524575
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index e5380272fce8..48586680e7dd 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -1677,10 +1677,10 @@ pub struct PathSegment {
     pub generic_arg_list: Option<trap::Label<GenericArgList>>,
     pub name_ref: Option<trap::Label<NameRef>>,
     pub param_list: Option<trap::Label<ParamList>>,
-    pub path_type: Option<trap::Label<PathType>>,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub path_type: Option<trap::Label<PathTypeRepr>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
     pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for PathSegment {
@@ -1708,8 +1708,8 @@ impl trap::TrapEntry for PathSegment {
         if let Some(v) = self.return_type_syntax {
             out.add_tuple("path_segment_return_type_syntaxes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("path_segment_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("path_segment_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -1866,7 +1866,7 @@ pub struct RecordField {
     pub id: trap::TrapId<RecordField>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
 
@@ -1883,8 +1883,8 @@ impl trap::TrapEntry for RecordField {
         if let Some(v) = self.name {
             out.add_tuple("record_field_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("record_field_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("record_field_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
             out.add_tuple("record_field_visibilities", vec![id.into(), v.into()]);
@@ -2131,49 +2131,49 @@ impl From<trap::Label<Resolvable>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RetType {
-    pub id: trap::TrapId<RetType>,
-    pub ty: Option<trap::Label<TypeRef>>,
+pub struct RetTypeRepr {
+    pub id: trap::TrapId<RetTypeRepr>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for RetType {
+impl trap::TrapEntry for RetTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ret_types", vec![id.into()]);
-        if let Some(v) = self.ty {
-            out.add_tuple("ret_type_ties", vec![id.into(), v.into()]);
+        out.add_tuple("ret_type_reprs", vec![id.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("ret_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RetType {
-    fn class_name() -> &'static str { "RetType" }
+impl trap::TrapClass for RetTypeRepr {
+    fn class_name() -> &'static str { "RetTypeRepr" }
 }
 
-impl From<trap::Label<RetType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RetType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RetType is a subclass of AstNode
+impl From<trap::Label<RetTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RetTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RetType>> for trap::Label<Element> {
-    fn from(value: trap::Label<RetType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RetType is a subclass of Element
+impl From<trap::Label<RetTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<RetTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RetType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RetType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RetType is a subclass of Locatable
+impl From<trap::Label<RetTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RetTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2460,7 +2460,7 @@ impl From<trap::Label<TokenTree>> for trap::Label<Locatable> {
 pub struct TupleField {
     pub id: trap::TrapId<TupleField>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
 
@@ -2474,8 +2474,8 @@ impl trap::TrapEntry for TupleField {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("tuple_field_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("tuple_field_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("tuple_field_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
             out.add_tuple("tuple_field_visibilities", vec![id.into(), v.into()]);
@@ -2521,7 +2521,7 @@ pub struct TypeBound {
     pub is_async: bool,
     pub is_const: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for TypeBound {
@@ -2543,8 +2543,8 @@ impl trap::TrapEntry for TypeBound {
         if let Some(v) = self.lifetime {
             out.add_tuple("type_bound_lifetimes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("type_bound_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("type_bound_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -2631,35 +2631,35 @@ impl From<trap::Label<TypeBoundList>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct TypeRef {
+pub struct TypeRepr {
     _unused: ()
 }
 
-impl trap::TrapClass for TypeRef {
-    fn class_name() -> &'static str { "TypeRef" }
+impl trap::TrapClass for TypeRepr {
+    fn class_name() -> &'static str { "TypeRepr" }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of AstNode
+impl From<trap::Label<TypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Element> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Element
+impl From<trap::Label<TypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Locatable
+impl From<trap::Label<TypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2929,7 +2929,7 @@ pub struct WherePred {
     pub id: trap::TrapId<WherePred>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub lifetime: Option<trap::Label<Lifetime>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
 
@@ -2946,8 +2946,8 @@ impl trap::TrapEntry for WherePred {
         if let Some(v) = self.lifetime {
             out.add_tuple("where_pred_lifetimes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("where_pred_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("where_pred_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.type_bound_list {
             out.add_tuple("where_pred_type_bound_lists", vec![id.into(), v.into()]);
@@ -3054,62 +3054,62 @@ impl From<trap::Label<ArrayExprInternal>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ArrayType {
-    pub id: trap::TrapId<ArrayType>,
+pub struct ArrayTypeRepr {
+    pub id: trap::TrapId<ArrayTypeRepr>,
     pub const_arg: Option<trap::Label<ConstArg>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub element_type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for ArrayType {
+impl trap::TrapEntry for ArrayTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("array_types", vec![id.into()]);
+        out.add_tuple("array_type_reprs", vec![id.into()]);
         if let Some(v) = self.const_arg {
-            out.add_tuple("array_type_const_args", vec![id.into(), v.into()]);
+            out.add_tuple("array_type_repr_const_args", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("array_type_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.element_type_repr {
+            out.add_tuple("array_type_repr_element_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ArrayType {
-    fn class_name() -> &'static str { "ArrayType" }
+impl trap::TrapClass for ArrayTypeRepr {
+    fn class_name() -> &'static str { "ArrayTypeRepr" }
 }
 
-impl From<trap::Label<ArrayType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ArrayType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of AstNode
+impl From<trap::Label<ArrayTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ArrayTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayType>> for trap::Label<Element> {
-    fn from(value: trap::Label<ArrayType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of Element
+impl From<trap::Label<ArrayTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ArrayTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ArrayType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of Locatable
+impl From<trap::Label<ArrayTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ArrayTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<ArrayType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of TypeRef
+impl From<trap::Label<ArrayTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<ArrayTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3186,9 +3186,9 @@ pub struct AssocTypeArg {
     pub generic_arg_list: Option<trap::Label<GenericArgList>>,
     pub name_ref: Option<trap::Label<NameRef>>,
     pub param_list: Option<trap::Label<ParamList>>,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
     pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
 
@@ -3217,8 +3217,8 @@ impl trap::TrapEntry for AssocTypeArg {
         if let Some(v) = self.return_type_syntax {
             out.add_tuple("assoc_type_arg_return_type_syntaxes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("assoc_type_arg_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("assoc_type_arg_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.type_bound_list {
             out.add_tuple("assoc_type_arg_type_bound_lists", vec![id.into(), v.into()]);
@@ -3639,7 +3639,7 @@ pub struct CastExpr {
     pub id: trap::TrapId<CastExpr>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub expr: Option<trap::Label<Expr>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for CastExpr {
@@ -3655,8 +3655,8 @@ impl trap::TrapEntry for CastExpr {
         if let Some(v) = self.expr {
             out.add_tuple("cast_expr_exprs", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("cast_expr_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("cast_expr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -3713,7 +3713,7 @@ pub struct ClosureExpr {
     pub is_gen: bool,
     pub is_move: bool,
     pub is_static: bool,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
 }
 
 impl trap::TrapEntry for ClosureExpr {
@@ -3991,7 +3991,7 @@ pub struct ConstParam {
     pub default_val: Option<trap::Label<ConstArg>>,
     pub is_const: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for ConstParam {
@@ -4013,8 +4013,8 @@ impl trap::TrapEntry for ConstParam {
         if let Some(v) = self.name {
             out.add_tuple("const_param_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("const_param_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("const_param_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -4123,58 +4123,58 @@ impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct DynTraitType {
-    pub id: trap::TrapId<DynTraitType>,
+pub struct DynTraitTypeRepr {
+    pub id: trap::TrapId<DynTraitTypeRepr>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
 
-impl trap::TrapEntry for DynTraitType {
+impl trap::TrapEntry for DynTraitTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("dyn_trait_types", vec![id.into()]);
+        out.add_tuple("dyn_trait_type_reprs", vec![id.into()]);
         if let Some(v) = self.type_bound_list {
-            out.add_tuple("dyn_trait_type_type_bound_lists", vec![id.into(), v.into()]);
+            out.add_tuple("dyn_trait_type_repr_type_bound_lists", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for DynTraitType {
-    fn class_name() -> &'static str { "DynTraitType" }
+impl trap::TrapClass for DynTraitTypeRepr {
+    fn class_name() -> &'static str { "DynTraitTypeRepr" }
 }
 
-impl From<trap::Label<DynTraitType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<DynTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of AstNode
+impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<DynTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<DynTraitType>> for trap::Label<Element> {
-    fn from(value: trap::Label<DynTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of Element
+impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<DynTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<DynTraitType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<DynTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of Locatable
+impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<DynTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<DynTraitType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<DynTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of TypeRef
+impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<DynTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4308,78 +4308,78 @@ impl From<trap::Label<FieldExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct FnPtrType {
-    pub id: trap::TrapId<FnPtrType>,
+pub struct FnPtrTypeRepr {
+    pub id: trap::TrapId<FnPtrTypeRepr>,
     pub abi: Option<trap::Label<Abi>>,
     pub is_async: bool,
     pub is_const: bool,
     pub is_unsafe: bool,
     pub param_list: Option<trap::Label<ParamList>>,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
 }
 
-impl trap::TrapEntry for FnPtrType {
+impl trap::TrapEntry for FnPtrTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("fn_ptr_types", vec![id.into()]);
+        out.add_tuple("fn_ptr_type_reprs", vec![id.into()]);
         if let Some(v) = self.abi {
-            out.add_tuple("fn_ptr_type_abis", vec![id.into(), v.into()]);
+            out.add_tuple("fn_ptr_type_repr_abis", vec![id.into(), v.into()]);
         }
         if self.is_async {
-            out.add_tuple("fn_ptr_type_is_async", vec![id.into()]);
+            out.add_tuple("fn_ptr_type_repr_is_async", vec![id.into()]);
         }
         if self.is_const {
-            out.add_tuple("fn_ptr_type_is_const", vec![id.into()]);
+            out.add_tuple("fn_ptr_type_repr_is_const", vec![id.into()]);
         }
         if self.is_unsafe {
-            out.add_tuple("fn_ptr_type_is_unsafe", vec![id.into()]);
+            out.add_tuple("fn_ptr_type_repr_is_unsafe", vec![id.into()]);
         }
         if let Some(v) = self.param_list {
-            out.add_tuple("fn_ptr_type_param_lists", vec![id.into(), v.into()]);
+            out.add_tuple("fn_ptr_type_repr_param_lists", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.ret_type {
-            out.add_tuple("fn_ptr_type_ret_types", vec![id.into(), v.into()]);
+            out.add_tuple("fn_ptr_type_repr_ret_types", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for FnPtrType {
-    fn class_name() -> &'static str { "FnPtrType" }
+impl trap::TrapClass for FnPtrTypeRepr {
+    fn class_name() -> &'static str { "FnPtrTypeRepr" }
 }
 
-impl From<trap::Label<FnPtrType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<FnPtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of AstNode
+impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FnPtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FnPtrType>> for trap::Label<Element> {
-    fn from(value: trap::Label<FnPtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of Element
+impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<FnPtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FnPtrType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<FnPtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of Locatable
+impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FnPtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FnPtrType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<FnPtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of TypeRef
+impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<FnPtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4387,62 +4387,62 @@ impl From<trap::Label<FnPtrType>> for trap::Label<TypeRef> {
 }
 
 #[derive(Debug)]
-pub struct ForType {
-    pub id: trap::TrapId<ForType>,
+pub struct ForTypeRepr {
+    pub id: trap::TrapId<ForTypeRepr>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for ForType {
+impl trap::TrapEntry for ForTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("for_types", vec![id.into()]);
+        out.add_tuple("for_type_reprs", vec![id.into()]);
         if let Some(v) = self.generic_param_list {
-            out.add_tuple("for_type_generic_param_lists", vec![id.into(), v.into()]);
+            out.add_tuple("for_type_repr_generic_param_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("for_type_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("for_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ForType {
-    fn class_name() -> &'static str { "ForType" }
+impl trap::TrapClass for ForTypeRepr {
+    fn class_name() -> &'static str { "ForTypeRepr" }
 }
 
-impl From<trap::Label<ForType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ForType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForType is a subclass of AstNode
+impl From<trap::Label<ForTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ForTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ForType>> for trap::Label<Element> {
-    fn from(value: trap::Label<ForType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForType is a subclass of Element
+impl From<trap::Label<ForTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ForTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ForType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ForType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForType is a subclass of Locatable
+impl From<trap::Label<ForTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ForTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ForType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<ForType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForType is a subclass of TypeRef
+impl From<trap::Label<ForTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<ForTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4663,58 +4663,58 @@ impl From<trap::Label<IfExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ImplTraitType {
-    pub id: trap::TrapId<ImplTraitType>,
+pub struct ImplTraitTypeRepr {
+    pub id: trap::TrapId<ImplTraitTypeRepr>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
 
-impl trap::TrapEntry for ImplTraitType {
+impl trap::TrapEntry for ImplTraitTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("impl_trait_types", vec![id.into()]);
+        out.add_tuple("impl_trait_type_reprs", vec![id.into()]);
         if let Some(v) = self.type_bound_list {
-            out.add_tuple("impl_trait_type_type_bound_lists", vec![id.into(), v.into()]);
+            out.add_tuple("impl_trait_type_repr_type_bound_lists", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ImplTraitType {
-    fn class_name() -> &'static str { "ImplTraitType" }
+impl trap::TrapClass for ImplTraitTypeRepr {
+    fn class_name() -> &'static str { "ImplTraitTypeRepr" }
 }
 
-impl From<trap::Label<ImplTraitType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ImplTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of AstNode
+impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ImplTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ImplTraitType>> for trap::Label<Element> {
-    fn from(value: trap::Label<ImplTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of Element
+impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ImplTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ImplTraitType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ImplTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of Locatable
+impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ImplTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ImplTraitType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<ImplTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of TypeRef
+impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<ImplTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4789,54 +4789,54 @@ impl From<trap::Label<IndexExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct InferType {
-    pub id: trap::TrapId<InferType>,
+pub struct InferTypeRepr {
+    pub id: trap::TrapId<InferTypeRepr>,
 }
 
-impl trap::TrapEntry for InferType {
+impl trap::TrapEntry for InferTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("infer_types", vec![id.into()]);
+        out.add_tuple("infer_type_reprs", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for InferType {
-    fn class_name() -> &'static str { "InferType" }
+impl trap::TrapClass for InferTypeRepr {
+    fn class_name() -> &'static str { "InferTypeRepr" }
 }
 
-impl From<trap::Label<InferType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<InferType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme InferType is a subclass of AstNode
+impl From<trap::Label<InferTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<InferTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<InferType>> for trap::Label<Element> {
-    fn from(value: trap::Label<InferType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme InferType is a subclass of Element
+impl From<trap::Label<InferTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<InferTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<InferType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<InferType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme InferType is a subclass of Locatable
+impl From<trap::Label<InferTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<InferTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<InferType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<InferType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme InferType is a subclass of TypeRef
+impl From<trap::Label<InferTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<InferTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5016,7 +5016,7 @@ pub struct LetStmt {
     pub initializer: Option<trap::Label<Expr>>,
     pub let_else: Option<trap::Label<LetElse>>,
     pub pat: Option<trap::Label<Pat>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for LetStmt {
@@ -5038,8 +5038,8 @@ impl trap::TrapEntry for LetStmt {
         if let Some(v) = self.pat {
             out.add_tuple("let_stmt_pats", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("let_stmt_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("let_stmt_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -5451,58 +5451,58 @@ impl From<trap::Label<MacroPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct MacroType {
-    pub id: trap::TrapId<MacroType>,
+pub struct MacroTypeRepr {
+    pub id: trap::TrapId<MacroTypeRepr>,
     pub macro_call: Option<trap::Label<MacroCall>>,
 }
 
-impl trap::TrapEntry for MacroType {
+impl trap::TrapEntry for MacroTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("macro_types", vec![id.into()]);
+        out.add_tuple("macro_type_reprs", vec![id.into()]);
         if let Some(v) = self.macro_call {
-            out.add_tuple("macro_type_macro_calls", vec![id.into(), v.into()]);
+            out.add_tuple("macro_type_repr_macro_calls", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for MacroType {
-    fn class_name() -> &'static str { "MacroType" }
+impl trap::TrapClass for MacroTypeRepr {
+    fn class_name() -> &'static str { "MacroTypeRepr" }
 }
 
-impl From<trap::Label<MacroType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MacroType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of AstNode
+impl From<trap::Label<MacroTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroType>> for trap::Label<Element> {
-    fn from(value: trap::Label<MacroType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of Element
+impl From<trap::Label<MacroTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MacroType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of Locatable
+impl From<trap::Label<MacroTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<MacroType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of TypeRef
+impl From<trap::Label<MacroTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<MacroTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5577,54 +5577,54 @@ impl From<trap::Label<MatchExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct NeverType {
-    pub id: trap::TrapId<NeverType>,
+pub struct NeverTypeRepr {
+    pub id: trap::TrapId<NeverTypeRepr>,
 }
 
-impl trap::TrapEntry for NeverType {
+impl trap::TrapEntry for NeverTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("never_types", vec![id.into()]);
+        out.add_tuple("never_type_reprs", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for NeverType {
-    fn class_name() -> &'static str { "NeverType" }
+impl trap::TrapClass for NeverTypeRepr {
+    fn class_name() -> &'static str { "NeverTypeRepr" }
 }
 
-impl From<trap::Label<NeverType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<NeverType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of AstNode
+impl From<trap::Label<NeverTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<NeverTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<NeverType>> for trap::Label<Element> {
-    fn from(value: trap::Label<NeverType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of Element
+impl From<trap::Label<NeverTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<NeverTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<NeverType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<NeverType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of Locatable
+impl From<trap::Label<NeverTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<NeverTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<NeverType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<NeverType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of TypeRef
+impl From<trap::Label<NeverTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<NeverTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5636,7 +5636,7 @@ pub struct OffsetOfExpr {
     pub id: trap::TrapId<OffsetOfExpr>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub fields: Vec<trap::Label<NameRef>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for OffsetOfExpr {
@@ -5652,8 +5652,8 @@ impl trap::TrapEntry for OffsetOfExpr {
         for (i, v) in self.fields.into_iter().enumerate() {
             out.add_tuple("offset_of_expr_fields", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("offset_of_expr_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("offset_of_expr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -5761,7 +5761,7 @@ impl From<trap::Label<OrPat>> for trap::Label<Pat> {
 pub struct Param {
     pub id: trap::TrapId<Param>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub pat: Option<trap::Label<Pat>>,
 }
 
@@ -5775,8 +5775,8 @@ impl trap::TrapEntry for Param {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("param_base_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("param_base_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("param_base_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.pat {
             out.add_tuple("param_pats", vec![id.into(), v.into()]);
@@ -5947,58 +5947,58 @@ impl From<trap::Label<ParenPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct ParenType {
-    pub id: trap::TrapId<ParenType>,
-    pub ty: Option<trap::Label<TypeRef>>,
+pub struct ParenTypeRepr {
+    pub id: trap::TrapId<ParenTypeRepr>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for ParenType {
+impl trap::TrapEntry for ParenTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("paren_types", vec![id.into()]);
-        if let Some(v) = self.ty {
-            out.add_tuple("paren_type_ties", vec![id.into(), v.into()]);
+        out.add_tuple("paren_type_reprs", vec![id.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("paren_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ParenType {
-    fn class_name() -> &'static str { "ParenType" }
+impl trap::TrapClass for ParenTypeRepr {
+    fn class_name() -> &'static str { "ParenTypeRepr" }
 }
 
-impl From<trap::Label<ParenType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ParenType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of AstNode
+impl From<trap::Label<ParenTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParenTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenType>> for trap::Label<Element> {
-    fn from(value: trap::Label<ParenType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of Element
+impl From<trap::Label<ParenTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParenTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ParenType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of Locatable
+impl From<trap::Label<ParenTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParenTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<ParenType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of TypeRef
+impl From<trap::Label<ParenTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<ParenTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6173,58 +6173,58 @@ impl From<trap::Label<PathPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct PathType {
-    pub id: trap::TrapId<PathType>,
+pub struct PathTypeRepr {
+    pub id: trap::TrapId<PathTypeRepr>,
     pub path: Option<trap::Label<Path>>,
 }
 
-impl trap::TrapEntry for PathType {
+impl trap::TrapEntry for PathTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("path_types", vec![id.into()]);
+        out.add_tuple("path_type_reprs", vec![id.into()]);
         if let Some(v) = self.path {
-            out.add_tuple("path_type_paths", vec![id.into(), v.into()]);
+            out.add_tuple("path_type_repr_paths", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for PathType {
-    fn class_name() -> &'static str { "PathType" }
+impl trap::TrapClass for PathTypeRepr {
+    fn class_name() -> &'static str { "PathTypeRepr" }
 }
 
-impl From<trap::Label<PathType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PathType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathType is a subclass of AstNode
+impl From<trap::Label<PathTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathType>> for trap::Label<Element> {
-    fn from(value: trap::Label<PathType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathType is a subclass of Element
+impl From<trap::Label<PathTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PathType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathType is a subclass of Locatable
+impl From<trap::Label<PathTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<PathType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathType is a subclass of TypeRef
+impl From<trap::Label<PathTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<PathTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6299,66 +6299,66 @@ impl From<trap::Label<PrefixExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct PtrType {
-    pub id: trap::TrapId<PtrType>,
+pub struct PtrTypeRepr {
+    pub id: trap::TrapId<PtrTypeRepr>,
     pub is_const: bool,
     pub is_mut: bool,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for PtrType {
+impl trap::TrapEntry for PtrTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ptr_types", vec![id.into()]);
+        out.add_tuple("ptr_type_reprs", vec![id.into()]);
         if self.is_const {
-            out.add_tuple("ptr_type_is_const", vec![id.into()]);
+            out.add_tuple("ptr_type_repr_is_const", vec![id.into()]);
         }
         if self.is_mut {
-            out.add_tuple("ptr_type_is_mut", vec![id.into()]);
+            out.add_tuple("ptr_type_repr_is_mut", vec![id.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("ptr_type_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("ptr_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for PtrType {
-    fn class_name() -> &'static str { "PtrType" }
+impl trap::TrapClass for PtrTypeRepr {
+    fn class_name() -> &'static str { "PtrTypeRepr" }
 }
 
-impl From<trap::Label<PtrType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of AstNode
+impl From<trap::Label<PtrTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PtrType>> for trap::Label<Element> {
-    fn from(value: trap::Label<PtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of Element
+impl From<trap::Label<PtrTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<PtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PtrType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of Locatable
+impl From<trap::Label<PtrTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PtrType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<PtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of TypeRef
+impl From<trap::Label<PtrTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<PtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6827,66 +6827,66 @@ impl From<trap::Label<RefPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct RefType {
-    pub id: trap::TrapId<RefType>,
+pub struct RefTypeRepr {
+    pub id: trap::TrapId<RefTypeRepr>,
     pub is_mut: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for RefType {
+impl trap::TrapEntry for RefTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ref_types", vec![id.into()]);
+        out.add_tuple("ref_type_reprs", vec![id.into()]);
         if self.is_mut {
-            out.add_tuple("ref_type_is_mut", vec![id.into()]);
+            out.add_tuple("ref_type_repr_is_mut", vec![id.into()]);
         }
         if let Some(v) = self.lifetime {
-            out.add_tuple("ref_type_lifetimes", vec![id.into(), v.into()]);
+            out.add_tuple("ref_type_repr_lifetimes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("ref_type_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("ref_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RefType {
-    fn class_name() -> &'static str { "RefType" }
+impl trap::TrapClass for RefTypeRepr {
+    fn class_name() -> &'static str { "RefTypeRepr" }
 }
 
-impl From<trap::Label<RefType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RefType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefType is a subclass of AstNode
+impl From<trap::Label<RefTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RefTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefType>> for trap::Label<Element> {
-    fn from(value: trap::Label<RefType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefType is a subclass of Element
+impl From<trap::Label<RefTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<RefTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RefType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefType is a subclass of Locatable
+impl From<trap::Label<RefTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RefTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<RefType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefType is a subclass of TypeRef
+impl From<trap::Label<RefTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<RefTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7019,7 +7019,7 @@ impl From<trap::Label<ReturnExpr>> for trap::Label<Locatable> {
 pub struct SelfParam {
     pub id: trap::TrapId<SelfParam>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub is_mut: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
     pub name: Option<trap::Label<Name>>,
@@ -7035,8 +7035,8 @@ impl trap::TrapEntry for SelfParam {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("param_base_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("param_base_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("param_base_type_reprs", vec![id.into(), v.into()]);
         }
         if self.is_mut {
             out.add_tuple("self_param_is_mut", vec![id.into()]);
@@ -7150,58 +7150,58 @@ impl From<trap::Label<SlicePat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct SliceType {
-    pub id: trap::TrapId<SliceType>,
-    pub ty: Option<trap::Label<TypeRef>>,
+pub struct SliceTypeRepr {
+    pub id: trap::TrapId<SliceTypeRepr>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for SliceType {
+impl trap::TrapEntry for SliceTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("slice_types", vec![id.into()]);
-        if let Some(v) = self.ty {
-            out.add_tuple("slice_type_ties", vec![id.into(), v.into()]);
+        out.add_tuple("slice_type_reprs", vec![id.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("slice_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for SliceType {
-    fn class_name() -> &'static str { "SliceType" }
+impl trap::TrapClass for SliceTypeRepr {
+    fn class_name() -> &'static str { "SliceTypeRepr" }
 }
 
-impl From<trap::Label<SliceType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<SliceType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of AstNode
+impl From<trap::Label<SliceTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SliceTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SliceType>> for trap::Label<Element> {
-    fn from(value: trap::Label<SliceType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of Element
+impl From<trap::Label<SliceTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<SliceTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SliceType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<SliceType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of Locatable
+impl From<trap::Label<SliceTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SliceTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SliceType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<SliceType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of TypeRef
+impl From<trap::Label<SliceTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<SliceTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7516,58 +7516,58 @@ impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct TupleType {
-    pub id: trap::TrapId<TupleType>,
-    pub fields: Vec<trap::Label<TypeRef>>,
+pub struct TupleTypeRepr {
+    pub id: trap::TrapId<TupleTypeRepr>,
+    pub fields: Vec<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for TupleType {
+impl trap::TrapEntry for TupleTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("tuple_types", vec![id.into()]);
+        out.add_tuple("tuple_type_reprs", vec![id.into()]);
         for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("tuple_type_fields", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("tuple_type_repr_fields", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for TupleType {
-    fn class_name() -> &'static str { "TupleType" }
+impl trap::TrapClass for TupleTypeRepr {
+    fn class_name() -> &'static str { "TupleTypeRepr" }
 }
 
-impl From<trap::Label<TupleType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TupleType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of AstNode
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleType>> for trap::Label<Element> {
-    fn from(value: trap::Label<TupleType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of Element
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TupleType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of Locatable
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<TupleType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of TypeRef
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7577,7 +7577,7 @@ impl From<trap::Label<TupleType>> for trap::Label<TypeRef> {
 #[derive(Debug)]
 pub struct TypeArg {
     pub id: trap::TrapId<TypeArg>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for TypeArg {
@@ -7587,8 +7587,8 @@ impl trap::TrapEntry for TypeArg {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("type_args", vec![id.into()]);
-        if let Some(v) = self.ty {
-            out.add_tuple("type_arg_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("type_arg_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -7637,7 +7637,7 @@ impl From<trap::Label<TypeArg>> for trap::Label<Locatable> {
 pub struct TypeParam {
     pub id: trap::TrapId<TypeParam>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub default_type: Option<trap::Label<TypeRef>>,
+    pub default_type: Option<trap::Label<TypeRepr>>,
     pub name: Option<trap::Label<Name>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
@@ -8203,7 +8203,7 @@ pub struct Const {
     pub is_const: bool,
     pub is_default: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
 
@@ -8229,8 +8229,8 @@ impl trap::TrapEntry for Const {
         if let Some(v) = self.name {
             out.add_tuple("const_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("const_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("const_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
             out.add_tuple("const_visibilities", vec![id.into(), v.into()]);
@@ -8594,7 +8594,7 @@ pub struct Function {
     pub is_gen: bool,
     pub is_unsafe: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
 }
@@ -8745,8 +8745,8 @@ pub struct Impl {
     pub is_const: bool,
     pub is_default: bool,
     pub is_unsafe: bool,
-    pub self_ty: Option<trap::Label<TypeRef>>,
-    pub trait_: Option<trap::Label<TypeRef>>,
+    pub self_ty: Option<trap::Label<TypeRepr>>,
+    pub trait_: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
 }
@@ -9456,7 +9456,7 @@ pub struct Static {
     pub is_mut: bool,
     pub is_static: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
 
@@ -9482,8 +9482,8 @@ impl trap::TrapEntry for Static {
         if let Some(v) = self.name {
             out.add_tuple("static_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("static_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("static_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
             out.add_tuple("static_visibilities", vec![id.into(), v.into()]);
@@ -9868,7 +9868,7 @@ pub struct TypeAlias {
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub is_default: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
@@ -9893,8 +9893,8 @@ impl trap::TrapEntry for TypeAlias {
         if let Some(v) = self.name {
             out.add_tuple("type_alias_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("type_alias_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("type_alias_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.type_bound_list {
             out.add_tuple("type_alias_type_bound_lists", vec![id.into(), v.into()]);
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index e2826bc1ab7b..a87f2d74caf4 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -133,7 +133,7 @@ impl Translator<'_> {
         }
     }
 
-    pub(crate) fn emit_type(&mut self, node: ast::Type) -> Label<generated::TypeRef> {
+    pub(crate) fn emit_type(&mut self, node: ast::Type) -> Label<generated::TypeRepr> {
         match node {
             ast::Type::ArrayType(inner) => self.emit_array_type(inner).into(),
             ast::Type::DynTraitType(inner) => self.emit_dyn_trait_type(inner).into(),
@@ -214,16 +214,16 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_array_type(&mut self, node: ast::ArrayType) -> Label<generated::ArrayType> {
+    pub(crate) fn emit_array_type(&mut self, node: ast::ArrayType) -> Label<generated::ArrayTypeRepr> {
         let const_arg = node.const_arg().map(|x| self.emit_const_arg(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::ArrayType {
+        let element_type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ArrayTypeRepr {
             id: TrapId::Star,
             const_arg,
-            ty,
+            element_type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(ArrayType, self, node, label);
+        emit_detached!(ArrayTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -263,7 +263,7 @@ impl Translator<'_> {
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
         let return_type_syntax = node.return_type_syntax().map(|x| self.emit_return_type_syntax(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let label = self.trap.emit(generated::AssocTypeArg {
             id: TrapId::Star,
@@ -273,7 +273,7 @@ impl Translator<'_> {
             param_list,
             ret_type,
             return_type_syntax,
-            ty,
+            type_repr,
             type_bound_list,
         });
         self.emit_location(label, &node);
@@ -415,12 +415,12 @@ impl Translator<'_> {
     pub(crate) fn emit_cast_expr(&mut self, node: ast::CastExpr) -> Label<generated::CastExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let expr = node.expr().map(|x| self.emit_expr(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::CastExpr {
             id: TrapId::Star,
             attrs,
             expr,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(CastExpr, self, node, label);
@@ -476,7 +476,7 @@ impl Translator<'_> {
         let is_const = node.const_token().is_some();
         let is_default = node.default_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::Const {
             id: TrapId::Star,
@@ -485,7 +485,7 @@ impl Translator<'_> {
             is_const,
             is_default,
             name,
-            ty,
+            type_repr,
             visibility,
         });
         self.emit_location(label, &node);
@@ -525,14 +525,14 @@ impl Translator<'_> {
         let default_val = node.default_val().map(|x| self.emit_const_arg(x));
         let is_const = node.const_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::ConstParam {
             id: TrapId::Star,
             attrs,
             default_val,
             is_const,
             name,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(ConstParam, self, node, label);
@@ -554,14 +554,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_dyn_trait_type(&mut self, node: ast::DynTraitType) -> Label<generated::DynTraitType> {
+    pub(crate) fn emit_dyn_trait_type(&mut self, node: ast::DynTraitType) -> Label<generated::DynTraitTypeRepr> {
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
-        let label = self.trap.emit(generated::DynTraitType {
+        let label = self.trap.emit(generated::DynTraitTypeRepr {
             id: TrapId::Star,
             type_bound_list,
         });
         self.emit_location(label, &node);
-        emit_detached!(DynTraitType, self, node, label);
+        emit_detached!(DynTraitTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -704,14 +704,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_fn_ptr_type(&mut self, node: ast::FnPtrType) -> Label<generated::FnPtrType> {
+    pub(crate) fn emit_fn_ptr_type(&mut self, node: ast::FnPtrType) -> Label<generated::FnPtrTypeRepr> {
         let abi = node.abi().map(|x| self.emit_abi(x));
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let is_unsafe = node.unsafe_token().is_some();
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
-        let label = self.trap.emit(generated::FnPtrType {
+        let label = self.trap.emit(generated::FnPtrTypeRepr {
             id: TrapId::Star,
             abi,
             is_async,
@@ -721,7 +721,7 @@ impl Translator<'_> {
             ret_type,
         });
         self.emit_location(label, &node);
-        emit_detached!(FnPtrType, self, node, label);
+        emit_detached!(FnPtrTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -746,16 +746,16 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_for_type(&mut self, node: ast::ForType) -> Label<generated::ForType> {
+    pub(crate) fn emit_for_type(&mut self, node: ast::ForType) -> Label<generated::ForTypeRepr> {
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::ForType {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ForTypeRepr {
             id: TrapId::Star,
             generic_param_list,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(ForType, self, node, label);
+        emit_detached!(ForTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -882,14 +882,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_impl_trait_type(&mut self, node: ast::ImplTraitType) -> Label<generated::ImplTraitType> {
+    pub(crate) fn emit_impl_trait_type(&mut self, node: ast::ImplTraitType) -> Label<generated::ImplTraitTypeRepr> {
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
-        let label = self.trap.emit(generated::ImplTraitType {
+        let label = self.trap.emit(generated::ImplTraitTypeRepr {
             id: TrapId::Star,
             type_bound_list,
         });
         self.emit_location(label, &node);
-        emit_detached!(ImplTraitType, self, node, label);
+        emit_detached!(ImplTraitTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -910,12 +910,12 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_infer_type(&mut self, node: ast::InferType) -> Label<generated::InferType> {
-        let label = self.trap.emit(generated::InferType {
+    pub(crate) fn emit_infer_type(&mut self, node: ast::InferType) -> Label<generated::InferTypeRepr> {
+        let label = self.trap.emit(generated::InferTypeRepr {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
-        emit_detached!(InferType, self, node, label);
+        emit_detached!(InferTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -979,14 +979,14 @@ impl Translator<'_> {
         let initializer = node.initializer().map(|x| self.emit_expr(x));
         let let_else = node.let_else().map(|x| self.emit_let_else(x));
         let pat = node.pat().map(|x| self.emit_pat(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::LetStmt {
             id: TrapId::Star,
             attrs,
             initializer,
             let_else,
             pat,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(LetStmt, self, node, label);
@@ -1180,14 +1180,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_macro_type(&mut self, node: ast::MacroType) -> Label<generated::MacroType> {
+    pub(crate) fn emit_macro_type(&mut self, node: ast::MacroType) -> Label<generated::MacroTypeRepr> {
         let macro_call = node.macro_call().map(|x| self.emit_macro_call(x));
-        let label = self.trap.emit(generated::MacroType {
+        let label = self.trap.emit(generated::MacroTypeRepr {
             id: TrapId::Star,
             macro_call,
         });
         self.emit_location(label, &node);
-        emit_detached!(MacroType, self, node, label);
+        emit_detached!(MacroTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1332,12 +1332,12 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_never_type(&mut self, node: ast::NeverType) -> Label<generated::NeverType> {
-        let label = self.trap.emit(generated::NeverType {
+    pub(crate) fn emit_never_type(&mut self, node: ast::NeverType) -> Label<generated::NeverTypeRepr> {
+        let label = self.trap.emit(generated::NeverTypeRepr {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
-        emit_detached!(NeverType, self, node, label);
+        emit_detached!(NeverTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1345,12 +1345,12 @@ impl Translator<'_> {
     pub(crate) fn emit_offset_of_expr(&mut self, node: ast::OffsetOfExpr) -> Label<generated::OffsetOfExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let fields = node.fields().map(|x| self.emit_name_ref(x)).collect();
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::OffsetOfExpr {
             id: TrapId::Star,
             attrs,
             fields,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(OffsetOfExpr, self, node, label);
@@ -1373,12 +1373,12 @@ impl Translator<'_> {
     pub(crate) fn emit_param(&mut self, node: ast::Param) -> Label<generated::Param> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let pat = node.pat().map(|x| self.emit_pat(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::Param {
             id: TrapId::Star,
             attrs,
             pat,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(Param, self, node, label);
@@ -1426,14 +1426,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_paren_type(&mut self, node: ast::ParenType) -> Label<generated::ParenType> {
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::ParenType {
+    pub(crate) fn emit_paren_type(&mut self, node: ast::ParenType) -> Label<generated::ParenTypeRepr> {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ParenTypeRepr {
             id: TrapId::Star,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(ParenType, self, node, label);
+        emit_detached!(ParenTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1485,7 +1485,7 @@ impl Translator<'_> {
         let path_type = node.path_type().map(|x| self.emit_path_type(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
         let return_type_syntax = node.return_type_syntax().map(|x| self.emit_return_type_syntax(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::PathSegment {
             id: TrapId::Star,
             generic_arg_list,
@@ -1494,7 +1494,7 @@ impl Translator<'_> {
             path_type,
             ret_type,
             return_type_syntax,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(PathSegment, self, node, label);
@@ -1502,14 +1502,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_path_type(&mut self, node: ast::PathType) -> Label<generated::PathType> {
+    pub(crate) fn emit_path_type(&mut self, node: ast::PathType) -> Label<generated::PathTypeRepr> {
         let path = node.path().map(|x| self.emit_path(x));
-        let label = self.trap.emit(generated::PathType {
+        let label = self.trap.emit(generated::PathTypeRepr {
             id: TrapId::Star,
             path,
         });
         self.emit_location(label, &node);
-        emit_detached!(PathType, self, node, label);
+        emit_detached!(PathTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1530,18 +1530,18 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_ptr_type(&mut self, node: ast::PtrType) -> Label<generated::PtrType> {
+    pub(crate) fn emit_ptr_type(&mut self, node: ast::PtrType) -> Label<generated::PtrTypeRepr> {
         let is_const = node.const_token().is_some();
         let is_mut = node.mut_token().is_some();
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::PtrType {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::PtrTypeRepr {
             id: TrapId::Star,
             is_const,
             is_mut,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(PtrType, self, node, label);
+        emit_detached!(PtrTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1629,13 +1629,13 @@ impl Translator<'_> {
     pub(crate) fn emit_record_field(&mut self, node: ast::RecordField) -> Label<generated::RecordField> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::RecordField {
             id: TrapId::Star,
             attrs,
             name,
-            ty,
+            type_repr,
             visibility,
         });
         self.emit_location(label, &node);
@@ -1734,18 +1734,18 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_ref_type(&mut self, node: ast::RefType) -> Label<generated::RefType> {
+    pub(crate) fn emit_ref_type(&mut self, node: ast::RefType) -> Label<generated::RefTypeRepr> {
         let is_mut = node.mut_token().is_some();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::RefType {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::RefTypeRepr {
             id: TrapId::Star,
             is_mut,
             lifetime,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(RefType, self, node, label);
+        emit_detached!(RefTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1774,14 +1774,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_ret_type(&mut self, node: ast::RetType) -> Label<generated::RetType> {
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::RetType {
+    pub(crate) fn emit_ret_type(&mut self, node: ast::RetType) -> Label<generated::RetTypeRepr> {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::RetTypeRepr {
             id: TrapId::Star,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(RetType, self, node, label);
+        emit_detached!(RetTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1815,14 +1815,14 @@ impl Translator<'_> {
         let is_mut = node.mut_token().is_some();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::SelfParam {
             id: TrapId::Star,
             attrs,
             is_mut,
             lifetime,
             name,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(SelfParam, self, node, label);
@@ -1842,14 +1842,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_slice_type(&mut self, node: ast::SliceType) -> Label<generated::SliceType> {
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::SliceType {
+    pub(crate) fn emit_slice_type(&mut self, node: ast::SliceType) -> Label<generated::SliceTypeRepr> {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::SliceTypeRepr {
             id: TrapId::Star,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(SliceType, self, node, label);
+        emit_detached!(SliceTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1874,7 +1874,7 @@ impl Translator<'_> {
         let is_mut = node.mut_token().is_some();
         let is_static = node.static_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::Static {
             id: TrapId::Star,
@@ -1883,7 +1883,7 @@ impl Translator<'_> {
             is_mut,
             is_static,
             name,
-            ty,
+            type_repr,
             visibility,
         });
         self.emit_location(label, &node);
@@ -2020,12 +2020,12 @@ impl Translator<'_> {
 
     pub(crate) fn emit_tuple_field(&mut self, node: ast::TupleField) -> Label<generated::TupleField> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::TupleField {
             id: TrapId::Star,
             attrs,
-            ty,
+            type_repr,
             visibility,
         });
         self.emit_location(label, &node);
@@ -2072,14 +2072,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_tuple_type(&mut self, node: ast::TupleType) -> Label<generated::TupleType> {
+    pub(crate) fn emit_tuple_type(&mut self, node: ast::TupleType) -> Label<generated::TupleTypeRepr> {
         let fields = node.fields().map(|x| self.emit_type(x)).collect();
-        let label = self.trap.emit(generated::TupleType {
+        let label = self.trap.emit(generated::TupleTypeRepr {
             id: TrapId::Star,
             fields,
         });
         self.emit_location(label, &node);
-        emit_detached!(TupleType, self, node, label);
+        emit_detached!(TupleTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2089,7 +2089,7 @@ impl Translator<'_> {
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let is_default = node.default_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
@@ -2099,7 +2099,7 @@ impl Translator<'_> {
             generic_param_list,
             is_default,
             name,
-            ty,
+            type_repr,
             type_bound_list,
             visibility,
             where_clause,
@@ -2111,10 +2111,10 @@ impl Translator<'_> {
     }
 
     pub(crate) fn emit_type_arg(&mut self, node: ast::TypeArg) -> Label<generated::TypeArg> {
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::TypeArg {
             id: TrapId::Star,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(TypeArg, self, node, label);
@@ -2127,14 +2127,14 @@ impl Translator<'_> {
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::TypeBound {
             id: TrapId::Star,
             generic_param_list,
             is_async,
             is_const,
             lifetime,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(TypeBound, self, node, label);
@@ -2309,13 +2309,13 @@ impl Translator<'_> {
     pub(crate) fn emit_where_pred(&mut self, node: ast::WherePred) -> Label<generated::WherePred> {
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let label = self.trap.emit(generated::WherePred {
             id: TrapId::Star,
             generic_param_list,
             lifetime,
-            ty,
+            type_repr,
             type_bound_list,
         });
         self.emit_location(label, &node);
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index 0154b5943d08..575320194090 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,15 +1,15 @@
-lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 2a4a561c08eafa7dfcac45c40b1bbde65e401983be3af4e0850f016a6bb2a732 9c86adf714e681e013dc4a0d944f2aa153a143ef8a8033d87254db9ae18cd896
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll b0e9c10a3fdd62e355dcc74f9d5198e6f4d597cd957efd4dd7a3418115055c5c 14fc7e1beb4751897639c5c3a64d5eb234ff0dc753d2db0b8d4c1845a55959f0
 lib/codeql/rust/elements/Abi.qll 4c973d28b6d628f5959d1f1cc793704572fd0acaae9a97dfce82ff9d73f73476 250f68350180af080f904cd34cb2af481c5c688dc93edf7365fd0ae99855e893
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
 lib/codeql/rust/elements/ArgList.qll 661f5100f5d3ef8351452d9058b663a2a5c720eea8cf11bedd628969741486a2 28e424aac01a90fb58cd6f9f83c7e4cf379eea39e636bc0ba07efc818be71c71
 lib/codeql/rust/elements/ArrayExpr.qll e4e7cff3518c50ec908271906dd46c1fbe9098faa1e8cd06a27f0a6e8d165ed1 fe02a4f4197f57ecd1e8e82d6c9384148ec29d8b106d7f696795b2f325e4a71b
 lib/codeql/rust/elements/ArrayListExpr.qll 451aedcecb479c385ff497588c7a07fda304fd5b873270223a4f2c804e96b245 a8cb008f6f732215623b5626c84b37b651ca01ccafb2cf4c835df35d5140c6ad
 lib/codeql/rust/elements/ArrayRepeatExpr.qll 4b7ed5be7d2caaf69f6fc0cd05b0e2416c52d547b1a73fb23d5a13007f75f4dd f6366f21cc48376b5fdf37e8c5c2b19415d4cbdeef09f33bb99cde5cb0f5b0e7
-lib/codeql/rust/elements/ArrayType.qll affd43d308200d60d08e8924cdbb2a17a827ebaa62a296e07bb9ce97451e3c4c 80589a7f79bf2ac293a027faf2589b3027a6c4a286533f2ffccad259a306a8cb
+lib/codeql/rust/elements/ArrayTypeRepr.qll 7d5148c9efaf13e6880b327ca426304f7574608a29e6b8a219ed291003cbe1ae 73a297b0307cd014d08ccb3c00fc57b6c115adadee72a0ebb4c01fcae9e47163
 lib/codeql/rust/elements/AsmExpr.qll 2f1c78e92b56d66a559543b2103d8f880dd4fa4c6907346f668b3714cf2355e9 12e174fc469c067c957f6c1a5969ab56a71a07c537ca930a564cce81c7ab4481
 lib/codeql/rust/elements/AssocItem.qll 5e514287bbe353d1d637991e7af836e5659ad66922df99af68ab61399e7f8f9a 3733af54938271161ee2720c32ac43228d519b5c46b7cea1e4bbe3dc634f8857
 lib/codeql/rust/elements/AssocItemList.qll ee719e7105a1936e2dd6cda0c55c73ff2704b6461861b2503ed86198484e4c06 de26c8127fd643b8b4567c0ce39511050f7ceefa0075a48a8ad03d50f56a1142
-lib/codeql/rust/elements/AssocTypeArg.qll 4740b296f596f58ed8d2788f55ffc1557ea22329b17b9374c885c4fd395d6eff 0191ca01b917d611ecd25f8171bbacd88335cf6a447f2f9da84dda816a170a65
+lib/codeql/rust/elements/AssocTypeArg.qll a01fb46212bed37224841e9aa3909290e720fdaffc7e443cf8a52f6bf7111ff4 9783f77b4983df46f054a18d339107fa17e5f392c360a772811ccf3bb9da32a1
 lib/codeql/rust/elements/AstNode.qll 5ee6355afb1cafd6dfe408b8c21836a1ba2aeb709fb618802aa09f9342646084 dee708f19c1b333cbd9609819db3dfdb48a0c90d26266c380f31357b1e2d6141
 lib/codeql/rust/elements/Attr.qll 53887a49513b95e38344b57d824a7474331467561f1edf38d5ca608d8cefa0cd 2e9eeb32ba6cc186691897979e30d32bc6eaff523e37064ee84cf09ded5afe17
 lib/codeql/rust/elements/AwaitExpr.qll d8b37c01f7d27f0ec40d92a533a8f09a06af7ece1ae832b4ea8f2450c1762511 92cdb7ff0efddf26bed2b7b2729fddd197e26c1a11c8fec0c747aab642710c21
@@ -21,16 +21,16 @@ lib/codeql/rust/elements/BreakExpr.qll 7ca3807a20e9a9a988d1fd7abebf240325ed422fc
 lib/codeql/rust/elements/CallExpr.qll f336500ca7a611b164d48b90e80edb0c0d3816792b0ececce659ac1ff1ffeb3e f99a9c55466418ef53860c44d9f2d6161af4b492178ddd9e5870dff742b70ae5
 lib/codeql/rust/elements/CallExprBase.qll 2846202b5208b541977500286951d96487bf555838c6c16cdd006a71e383745a c789d412bf099c624329379e0c7d94fa0d23ae2edea7a25a2ea0f3c0042ccf62
 lib/codeql/rust/elements/Callable.qll e1ed21a7e6bd2426f6ccd0e46cee506d8ebf90a6fdc4dca0979157da439853aa 02f6c09710116ce82157aec9a5ec706983c38e4d85cc631327baf8d409b018c6
-lib/codeql/rust/elements/CastExpr.qll ba281bde130f43c486c4ad889539b77fba9e41afdf7980e50b6a8696a1ec7527 61257003d395896ec60729d0bc01da36697615bb725d07141255fbb5c44e50a0
+lib/codeql/rust/elements/CastExpr.qll cd8333612f94b47b19ea45cd0f78d62855b30e1a86d7f3052a7bec503bc8f575 198089248d838155081586f81403320ca88375bf178f8d831b0860693bb85386
 lib/codeql/rust/elements/ClosureBinder.qll 977df800f97cc9b03fffb5e5e1fc6acd08a2938e04cb6ad91108784a15b0d510 f6fad4127226fe1dff2f16416d8a7fde5d8ab4a88f30e443ac5e5ff618de3e05
-lib/codeql/rust/elements/ClosureExpr.qll 192f67bb98d455f7de9eb871fc8f7353dfd991b857ed9fe65d01ef8610ece852 af99426b33dcf19ca4b97817dd94dd102cb0884c30bf7d947e9e6762e1c152ee
+lib/codeql/rust/elements/ClosureExpr.qll 67e2a106e9154c90367b129987e574d2a9ecf5b297536627e43706675d35eaed d6a381132ddd589c5a7ce174f50f9620041ddf690e15a65ebfb05ff7e7c02de7
 lib/codeql/rust/elements/Comment.qll fedad50575125e9a64a8a8776a8c1dbf1e76df990f01849d9f0955f9d74cb2a6 8eb1afad1e1007a4f0090fdac65d81726b23eda6517d067fd0185f70f17635ab
-lib/codeql/rust/elements/Const.qll 2843a870e2abdf5b63fbea13f8a9ec4981b74369adec2ed3ce00a7d6f5a6fee3 c0bdb467cce63dcd3c65b21ef0836d8bf4e6c8d7d70049df8581fd35fdd03083
+lib/codeql/rust/elements/Const.qll bf6c62e79da145aa50ee9d24278510c3762cad921bfe76684b20fac4895653ef 31df5752216725a88d53cfc4a1432fa6cdc39251a8560d695135c55185ab22dd
 lib/codeql/rust/elements/ConstArg.qll f37b34417503bbd2f3ce09b3211d8fa71f6a954970c2738c73be6c55f204e58e 15ef5e189b67cfdfe4d16909e0b411ac8fdd4ef187c328bdede03a1a5e416b54
 lib/codeql/rust/elements/ConstBlockPat.qll a25f42b84dbeb33e10955735ef53b8bb7e3258522d6d1a9068f19adaf1af89d9 eeb816d2b54db77a1e7bb70e90b68d040a0cd44e9d44455a223311c3615c5e6e
-lib/codeql/rust/elements/ConstParam.qll bda26c61f531b4a6bbe8c95c414f5431b75bbc3d9b559fc6dc21d60b32f993f9 dc82bcba1a513d1d9e0072ec252b78a17ff7217b2064290b1791b24f72a99221
+lib/codeql/rust/elements/ConstParam.qll 248db1e3abef6943326c42478a15f148f8cdaa25649ef5578064b15924c53351 28babba3aea28a65c3fe3b3db6cb9c86f70d7391e9d6ef9188eb2e4513072f9f
 lib/codeql/rust/elements/ContinueExpr.qll 9f27c5d5c819ad0ebc5bd10967ba8d33a9dc95b9aae278fcfb1fcf9216bda79c 0dc061445a6b89854fdce92aaf022fdc76b724511a50bb777496ce75c9ecb262
-lib/codeql/rust/elements/DynTraitType.qll 5d249ac6b61916dad08be29631de77405928f0f38da499c66c1c412347945860 2adc38d1afd039b48c56d934e521e4a41589f761b988587bc55781104d6bd996
+lib/codeql/rust/elements/DynTraitTypeRepr.qll 5953263ec1e77613170c13b5259b22a71c206a7e08841d2fa1a0b373b4014483 d4380c6cc460687dcd8598df27cad954ef4f508f1117a82460d15d295a7b64ab
 lib/codeql/rust/elements/Element.qll 0b62d139fef54ed2cf2e2334806aa9bfbc036c9c2085d558f15a42cc3fa84c48 24b999b93df79383ef27ede46e38da752868c88a07fe35fcff5d526684ba7294
 lib/codeql/rust/elements/Enum.qll 2f122b042519d55e221fceac72fce24b30d4caf1947b25e9b68ee4a2095deb11 83a47445145e4fda8c3631db602a42dbb7a431f259eddf5c09dccd86f6abdd0e
 lib/codeql/rust/elements/Expr.qll e5d65e805ccf440d64d331e55df4c4144ab8c8f63f367382494714087659ffe8 2bbc1e5d3a65f413ec33d9822fa451fbdbe32349158db58cc0bfcfafb0e21bda
@@ -41,32 +41,32 @@ lib/codeql/rust/elements/ExternItem.qll c39bbae40fa569d3d84a10045d7eeced3db85e6c
 lib/codeql/rust/elements/ExternItemList.qll bc96f188970e8dc0cd1e77dea3e49b715edf6392539add5744cb1b396064a3b0 d1270d50448b36947372e86337a3efb5ed416c77aac709f6421d4d2f06999a7a
 lib/codeql/rust/elements/FieldExpr.qll 8102cd659f9059cf6af2a22033cfcd2aae9c35204b86f7d219a05f1f8de54b3b f818169dddf5102095ae1410583615f80031376a08b5307d0c464e79953c3975
 lib/codeql/rust/elements/FieldList.qll bd243adc4696c60f636055a1c2da28039fe2028476c9247eb6a68003b849b757 ab63cdf410afd1e515f873b49f46bb5c2bf27e6c78fd206ccbdba064c4c0a4b2
-lib/codeql/rust/elements/FnPtrType.qll c4a90dc660cf620972dc23b95494f5caf9f050eabd4bdb52fdc061f8797ba9a1 f8defc91582fa503607664668f9e2e6c2cd8b320c7c449610f21e52e332a129f
+lib/codeql/rust/elements/FnPtrTypeRepr.qll 25a88a8445b4abfaf7c95fcef03db5328aa81e35cebe56516bdda01380f0a69e 0a77d08b6b2d63e7a037f366b6dffd5006e975a8af2424af60a4f9ad74d441ba
 lib/codeql/rust/elements/ForExpr.qll 0cc8bfe10b8baf62a1ff65c8463cfb17ab64b41c30c9e1edb962a227df2036d9 b1be73294e6da0f49fd32177ad0b05fecf26081d5ce424f288be99a4bd59cc84
-lib/codeql/rust/elements/ForType.qll 0036bed8749358c356d78c4a0eef40d73e2796284293cde5604ae70ddd6d0470 4edcaf8f7c67d42ebe3ebb1be6a7643758717d4fe88f5f648b6a1c5ff4ee4de7
+lib/codeql/rust/elements/ForTypeRepr.qll dc4e00cd23606df93d753f2ca6862b55a10c722a7e952bb2e11b494738d2a3d2 ca169d2faca3baab3720086f7b2de5c26f55faf2dbab958298377ad65f73949b
 lib/codeql/rust/elements/Format.qll 51222fa2d2e85d496ab093d74d3bc606ede3ce48f926106e059dc8478e657203 b4da6be38413c86f2e9d82004624abab16e23ef238197a5c85246009cce276d5
 lib/codeql/rust/elements/FormatArgsArg.qll 5bc9b4cd1bac7131165836e93838c45452a08ea6011741cbddace3cbf9c69440 f825140e98dc9800d5c045402186793c7b21511448e2f6bf6402d1e06305219c
 lib/codeql/rust/elements/FormatArgsExpr.qll 8127cbe4082f7acc3d8a05298c2c9bea302519b8a6cd2d158a83c516d18fc487 88cf9b3bedd69a1150968f9a465c904bbb6805da0e0b90cfd1fc0dab1f6d9319
 lib/codeql/rust/elements/FormatArgument.qll f6fe17ee1481c353dd42edae8b5fa79aeb99dff25b4842ec9a6f267b1837d1e3 5aed19c2daf2383b89ad7fd527375641cff26ddee7afddb89bc0d18d520f4034
 lib/codeql/rust/elements/FormatTemplateVariableAccess.qll ff3218a1dda30c232d0ecd9d1c60bbb9f3973456ef0bee1d1a12ad14b1e082b5 e4316291c939800d8b34d477d92be9404a30d52b7eee37302aef3d3205cf4ae0
-lib/codeql/rust/elements/Function.qll 2c76c2c7036891996b1f0ebde16c414edf37ebb44ff9c3483088dc6218733e07 d84d017d98aa240bf3bee6502a030aa8cfb7ed95425ffa9853e73b41485e1f4a
+lib/codeql/rust/elements/Function.qll 61fafe4bc91c997e9fb64f2770fc6682d333c61df3283fac58163df14a500430 ca7cb756942ccd01f961f3e959c7fddabeaabb72c4226ca756a6a30a4b1a4c48
 lib/codeql/rust/elements/GenericArg.qll 5f11ce0e3c5f08de84db61f56ba1b984652455ba6b95a8b8a5b5a235913d4072 756b6a73d66fde45bdcc65ce2362a5b1391af2927e6d54b6550b3ecd5fd11e75
 lib/codeql/rust/elements/GenericArgList.qll dcf274db517b0e8f19e4545d77f86cdd4066ff2805e68c808d0bb5750b49f569 1055a82929e850264e501b367ef4d314a3e6bb8943ec95f4284d157fb4d0092f
 lib/codeql/rust/elements/GenericParam.qll b58448b808d6dfa05db9574f54c22ce51f0b1d78784263c75a95d6bfc787067d 4afbab71fe717d7d7d3e2f60ea8c3d97bcb29b17b4efb79eabfe8f070edcb9bb
 lib/codeql/rust/elements/GenericParamList.qll 91d6f8cab06d7a3c53cfc714698a04c867867536705f03ed37b135e9e87f78c8 d1d88c31f712ca7ea83b6bf61466710069f2fbdfa40499321686e2867b99b35f
 lib/codeql/rust/elements/IdentPat.qll ad5f202316d4eeee3ca81ea445728f4ad7eb6bb7d81232bc958c22a93d064bf2 7ce2772e391e593d8fd23b2b44e26d0d7e780327ec973fcc9dce52a75fda0e36
 lib/codeql/rust/elements/IfExpr.qll f62153e8098b3eb08b569d4e25c750bc686665651579db4bc9e11dcef8e75d63 55006a55d612f189e73caa02f7b4deda388c692f0a801cdda9f833f2afdca778
-lib/codeql/rust/elements/Impl.qll 9593c47af4fa08afb19c52aab7d0bac6740fed7ec60201f47e7bc46f13bfb329 4ec840401563ab6136b99491b881c9a10108240de972b19ec64227e1e7d73e65
-lib/codeql/rust/elements/ImplTraitType.qll f7241044f6666a509cfbc01bf6df3db5360e67dd0f9baba4a323566701359203 350636d0b1c7a77e006170cbfa9108c259dd5831b0f242da76c10be3ecc32870
+lib/codeql/rust/elements/Impl.qll 6407348d86e73cdb68e414f647260cb82cb90bd40860ba9c40248d82dcba686c f60e07c8731185f7aa9c792a40c120669920d95f5400658de102b4a3ce30dd10
+lib/codeql/rust/elements/ImplTraitTypeRepr.qll e2d5a3ade0a9eb7dcb7eec229a235581fe6f293d1cb66b1036f6917c01dff981 49367cada57d1873c9c9d2b752ee6191943a23724059b2674c2d7f85497cff97
 lib/codeql/rust/elements/IndexExpr.qll 0e2e9f018d06ae72be0fc4ddbc019a9aacd8a06f42b4c4431760bd149e7f2290 2bcfd557abd53a48e48de7915c4f2089107c62dfb3e732a904848248dfd3727b
-lib/codeql/rust/elements/InferType.qll c71184ae6aa181be94e299882503350e057493e17f1133a1e96162a0e5cbd1ef f0f19b611708df45a6ff811f8066c8042a8e1ac9b7bd94910514547ea430d3d5
+lib/codeql/rust/elements/InferTypeRepr.qll 0a7b3e92512b2b167a8e04d650e12700dbbb8b646b10694056d622ba2501d299 e5e67b7c1124f430750f186da4642e646badcdcf66490dd328af3e64ac8da9e9
 lib/codeql/rust/elements/Item.qll 59353bf99dea5b464f45ed0dc5cef2db8208e92985d81dcd0b5ea09b638d10e4 2b0b87a4b1a1d9b512a67279d1dec2089d22d1df121585f7a9ca9661d689f74f
 lib/codeql/rust/elements/ItemList.qll c33e46a9ee45ccb194a0fe5b30a6ad3bcecb0f51486c94e0191a943710a17a7d 5a69c4e7712b4529681c4406d23dc1b6b9e5b3c03552688c55addab271912ed5
 lib/codeql/rust/elements/Label.qll a31d41db351af7f99a55b26cdbbc7f13b4e96b660a74e2f1cc90c17ee8df8d73 689f87cb056c8a2aefe1a0bfc2486a32feb44eb3175803c61961a6aeee53d66e
 lib/codeql/rust/elements/LabelableExpr.qll 598be487cd051b004ab95cbbc3029100069dc9955851c492029d80f230e56f0d 92c49b3cfdaba07982f950e18a8d62dae4e96f5d9ae0d7d2f4292628361f0ddc
 lib/codeql/rust/elements/LetElse.qll 85d16cb9cb2162493a9bacfe4b9e6a3b325d9466175b6d1a8e649bdf2191b864 c268d0878e9f82e8ede930b3825745c39ab8cd4db818eb9be6dc5ca49bee7579
 lib/codeql/rust/elements/LetExpr.qll 435f233890799a9f52972a023e381bc6fe2e0b3df1e696dc98b21682a3c1d88e b34da72dd222a381e098f160551ec614ebb98eb46af35c6e1d337e173d8ec4b9
-lib/codeql/rust/elements/LetStmt.qll e589d750ff87c25e28e15dab61e1a3555a45ced42158b05c991c6f5873abd86a 383484181b825cd7bc20e014fc4d5888f66e1f257502e1893f3d55aed2cdef3d
+lib/codeql/rust/elements/LetStmt.qll b89881b3e57317941f74adb39f16eb665380128a6bdfaacf4dce2499cdaea2e2 2890d12a475f045a8a1213e5c7751a05e63a72978a20fd3f4862e281048b2f0e
 lib/codeql/rust/elements/Lifetime.qll 048b81704723fab0ad9011f2c26a61e4a37b901c9f8372a6a74a04bdd85e273d 1d1e47c37c74ed092aa89ed4d38f49de3ee8bd9677669a33488fadda9ff733d1
 lib/codeql/rust/elements/LifetimeArg.qll 58a3c02b5ae720a48533332fb1808fbcc993cd1dfdb717894ba95a4c1ce3de4d 07da9323f89b92da86efa3f44a0f96c4c9738b3a28a136c4523243be79365396
 lib/codeql/rust/elements/LifetimeParam.qll db9f2c7bb32d49808993b400875e79560ac546736f106983398e32c9fdac51ca 0cb2ceaac7b0459f149fcce5ed708c9445fae7e340ec0e63744987a4fc852ef4
@@ -82,7 +82,7 @@ lib/codeql/rust/elements/MacroItems.qll 00a5d41f7bb836d952abbd9382e42f72a9d81e65
 lib/codeql/rust/elements/MacroPat.qll dbf193b4fb544ac0b5a7dcfc31a6652de7239b6e643ff15b05868b2c142e940c 19b45c0a1eb1198e450c05d564b5d4aa0d6da29e7db84b9521eadf901e20a932
 lib/codeql/rust/elements/MacroRules.qll a94535506798077043b9c1470992ac4310bf67bcce5f722080886d1b3e6d90d1 bd8e08a7171991abc85100b45267631e66d1b332caf1e5882cd17caee5cf18a3
 lib/codeql/rust/elements/MacroStmts.qll 6e9a1f90231cb72b27d3ff9479e399a9fba4abd0872a5005ab2fac45d5ca9be0 d6ca3a8254fc45794a93c451a3305c9b4be033a467ad72158d40d6f675a377a0
-lib/codeql/rust/elements/MacroType.qll e5a153643e49a6be41483ad944550a030e0500764947b4e328cef6fa08c4fbd4 a42332c0a9c5cf7317fc49f3e1049e7751004fcc3efa056bbe058a8bfa2ef0cb
+lib/codeql/rust/elements/MacroTypeRepr.qll 92fa5f6d20cce8fa3f2b4b823a8a77fdb7c11f2c2b12b8f900828c3a54eca334 51289f2622d1bb58d9a093255da2c05084a0b184f02e69e2526ec7fefdfdfd75
 lib/codeql/rust/elements/MatchArm.qll c39fd6cc0da24b1ff8d1e42835bcfee7695ad13580e3c7c50acd7c881b1cd894 62a31d2bd125e6aaebefc406e541a641271d3c497a377959f94dd4735b2bfbf8
 lib/codeql/rust/elements/MatchArmList.qll e6c48fd7419d88e996b82eb45e4aa2686dfd079b283b02be7710192fb2cb93a0 0ec63a0ca56f5f7f80093fd3e77b198b74c6289e67be55dc6a4deb610753c7bd
 lib/codeql/rust/elements/MatchExpr.qll e9ef1664f020823b6f4bb72d906a9dc0c1ee6432d4a9a13f7dbdbab2b2b1ee4d 38d71e5c487abcb5682293c573343be66e499a6e131bb630604c120d34b7777b
@@ -93,48 +93,48 @@ lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193
 lib/codeql/rust/elements/Module.qll 0bc85019177709256f8078d9de2a36f62f848d476225bff7bba1e35f249875c7 3fbb70e0c417a644dd0cada2c364c6e6876cfa16f37960e219c87e49c966c94e
 lib/codeql/rust/elements/Name.qll 3d7ed16c232912e30e5a075f5087ad344a8f76dcc27bc8f71a80c133802b89d7 036dc3ba0c20eb0907ef6dcc532214aa5de8e0de0fa819eca1fce0355b3741a3
 lib/codeql/rust/elements/NameRef.qll f11e33cdbefb3efdd8db6cd1eee593948a16ef5dd13e781c167ebd5e35b22e8c acda02258d55a6ecda0bd92eecf1778e0737a46e861a41c7dfd3203acc0eb4e9
-lib/codeql/rust/elements/NeverType.qll 669823dd60bba0cebac614f9dbad9dc9228405d76e62092e265df57fdd2e04e2 8fe32975ef80d86fb8b218f56962f0a89911008a8d6989e245c3e0362f2c747f
-lib/codeql/rust/elements/OffsetOfExpr.qll 8f6dd1fe0aad1642e58f5e97620306e4b36cdf01324fead1e2a92e8e60951c41 b192f7a5fae3049a6cac3b7a225a0e590f744e6c5ff6346ffdd1699f83bf718f
+lib/codeql/rust/elements/NeverTypeRepr.qll 538a8c2d4063dca2497a69b6b9e2fed418cbf32159e2bf9e044c59fff6a3b31a d6f827520c9dcfb97ac5619c420035305d4508017dc3517ba91e36d5d3298a72
+lib/codeql/rust/elements/OffsetOfExpr.qll 370734a01c72364c9d6a904597190dac99dc1262631229732c8687fd1b3e2aa0 e222d2688aa18ed6eec04f2f6ac1537f5c7467d2cef878122e8fc158d4f6f99e
 lib/codeql/rust/elements/OrPat.qll 408b71f51edbfc79bf93b86fb058d01fa79caf2ebfeef37b50ae1da886c71b68 4a3f2b00db33fe26ee0859e35261016312cb491e23c46746cdd6d8bb1f6c88ef
 lib/codeql/rust/elements/Param.qll d0c0a427c003bbbacaeb0c2f4566f35b997ad0bca4d49f97b50c3a4bd1ddbd71 e654a17dfcb7aaeb589e7944c38f591c4cf922ebceb834071bcb9f9165ee48be
-lib/codeql/rust/elements/ParamBase.qll ab8cb39ac313a5dce7d1a6dcd490c5033034d88f0e402f315f4236bb76c2c464 414afc1f34c1df28f76220c5d3255ae3d7629f3df8b870d0949f3a6c87e26d71
+lib/codeql/rust/elements/ParamBase.qll 6fe595b1bebd4a760e17fb364e5aa77505cc57b9bda89c21abdad1ce9e496419 f03316c25d38ecc56c16d7d36358144072159f6ab176315293c7bf3b45b35fff
 lib/codeql/rust/elements/ParamList.qll 33a22ba7de565db4009d3f56eecd5ef809c28d9dce9bbac3fb71b528baae4f70 004375e227d87f76f930322ad3eac274f9b691bf58785ae69977fa319f3dba7e
 lib/codeql/rust/elements/ParenExpr.qll b635f0e5d300cd9cf3651cfcefd58316c21727295bbfd44b1f5672f9e3de67b6 d81c0034d4ea7ca5829f9b00e0a634ba5b557a6296d99f0b5344b11e1ba705a1
 lib/codeql/rust/elements/ParenPat.qll 40d033de6c85ad042223e0da80479adebab35494396ab652da85d3497e435c5a 8f2febe5d5cefcb076d201ae9607d403b9cfe8169d2f4b71d13868e0af43dc25
-lib/codeql/rust/elements/ParenType.qll e1f5695b143c97b98ccdb460a5cf872461cfc13b83a4f005f26c288dc0afae10 1164f8efae7f255925411bddb33939fab0bf1c07955a16fef173b3f4675d09ae
+lib/codeql/rust/elements/ParenTypeRepr.qll 8f35ca4ad9077ef1636f011df6875df8840a1937db5adee2ddf6ffff4bcb0766 c9b4bcd429026908a125cc1a772a1005da7754c5257b8c63685befb6dd4d7aa8
 lib/codeql/rust/elements/Pat.qll 56211c5cb4709e7c12a2bfd2da5e413a451672d99e23a8386c08ad0b999fd45c b1b1893a13a75c4f0390f7e2a14ee98a46f067cfdc991a8d43adc82497d20aff
 lib/codeql/rust/elements/Path.qll 94869df09b929c4a60bae42b7e3a66c007f41078c08b7d9c6defb705b953ce8e eb317f75b89978d41fd3b166c7e3d871da4c04b3e17afbbcd0a5d73881e0d1d9
-lib/codeql/rust/elements/PathExpr.qll 906df1d80c662b79f1b0b0428c39754b7f8dbcb2234919dd45dd8206a099dd36 1d6015afab6378c926c5838c9a5772cfcfeedf474e2eeca3e46085300ff8d4e1
+lib/codeql/rust/elements/PathExpr.qll b52834ff2c725e7e0a224fec91864f0ac13bb7228e27d0e9f82a49c3fba6646f 8723cbbc9ad5b5ee34d80f68dea0cbb2be8e74df0234fc28e1bc7a72687cf25a
 lib/codeql/rust/elements/PathExprBase.qll bb41092ec690ae926e3233c215dcaf1fd8e161b8a6955151949f492e02dba13a b2257072f8062d31c29c63ee1311b07e0d2eb37075f582cfc76bb542ef773198
 lib/codeql/rust/elements/PathPat.qll 6897e69bcb24b56d39ede796cf5767988dcd5741e02333fa8495dd7c814f771a 2a011fb92f17e4b4ff713e6d29f591054dfede22a9aaa006e67fca2c23ab76bf
-lib/codeql/rust/elements/PathSegment.qll 9560551cf8b65e84705e7f302e12b48330e048613129e87c0f65a7eb297a6cc3 3aa75a5fd81f8ea32bd2b4bf0c51c386de57cbe9ab035fe3ec68ad7fcf51b375
-lib/codeql/rust/elements/PathType.qll 257ede178bb74ebdb8e266ebaa95082e7fb7cc8d921ef476f4df268ee8a1366c c48f6e04a8945a11f965e71819f68c00abc53a055042882b61716feda3ca63ae
+lib/codeql/rust/elements/PathSegment.qll df95d0b621623f2383634031a49c76949f25550b82cca0f73fb89f39487a9a2b 37addce4537f7864e24f6da0d4c6545a105df598a3f1428c33404aa6dff445c4
+lib/codeql/rust/elements/PathTypeRepr.qll 29028e35e93e8d1a3ec2eac7d65347e60364c20f9f6474bc74808bfc0efdd2f8 99058b68f79b01e9889f10ddb2f6e1fb40ad85475e459c7e9629d30f7c014bca
 lib/codeql/rust/elements/PrefixExpr.qll 107e7bd111b637fd6d76026062d54c2780760b965f172ef119c50dd0714a377d 46954a9404e561c51682395729daac3bda5442113f29839d043e9605d63f7f6d
-lib/codeql/rust/elements/PtrType.qll b137f47a53e41b3b30c7d80dbdd6724bf15f99530ca40cc264a04af5f07aa878 b2ffdf739bfb7564d942fe54409834a59511c0b305b6d5b2219a8ee0ef594332
+lib/codeql/rust/elements/PtrTypeRepr.qll 2eb2b6f6e5858a10fa1b10d85400ed6db781339bf152162a2fd33213c1ce083b bb99c2da04c80d3c14f47cda1feb9719af801d209becb3d9b20746a2a3b8fc02
 lib/codeql/rust/elements/RangeExpr.qll 43785bea08a6a537010db1138e68ae92eed7e481744188dfb3bad119425ff740 5e81cfbdf4617372a73d662a248a0b380c1f40988a5daefb7f00057cae10d3d4
 lib/codeql/rust/elements/RangePat.qll b5c0cfc84b8a767d58593fa7102dcf4be3ff8b02ba2f5360c384fa8af4aac830 cc28399dd99630bfa50c54e641a3833abe6643137d010a0a25749d1d70e8c911
 lib/codeql/rust/elements/RecordExpr.qll eb402960c5c6a14d0a0ffebd61a352b59b5d1cc1c2531cacd54754310a812d77 415c93384e63cf38003dde987715554ebf45fc32ba03bc5fd78b8d2501812de1
 lib/codeql/rust/elements/RecordExprField.qll edac04146849e2aeca27e7bbb896c21aa2e2b15736b1e8a06ac51ab01433b3ac 7c062bd6d5dd5b1d972450fb0b3272cd9b45f94ccd668c3bd4347e2dce3279ed
 lib/codeql/rust/elements/RecordExprFieldList.qll 672c3854cb84090c8a2e9311c43448016dc2614ecbf86dbe404156304674e38f 01ae0ffca0bf640c61120e36fcf2c560555f4aabbd49ddce6f5c1a3561dbfc31
-lib/codeql/rust/elements/RecordField.qll 9c462033cc889756876cb3d2a07e4f0d9a67064cf188cdd68e08ab21e5edc459 437254bbf6537f1a575ae344c2e23ffad7138776db8f7ebf90026c13886a2638
+lib/codeql/rust/elements/RecordField.qll 87d68aa912574596ba09ecb3ab437472635cd76eff49cd5bef00eaabbd264f08 01871ee4dd9bd02acd981fbc109abfa4ee1b303deaa148484476317c4c41c924
 lib/codeql/rust/elements/RecordFieldList.qll cebab3fba41221e61cda801070a7f414b62b4fbcf2206e35462c0da35ad75c3f db092d47eea871d61541b9711d7139a99394e0ed83901a8ae60f03dfa8ed722f
 lib/codeql/rust/elements/RecordPat.qll a210d700e710107100fedad1098fb789056a0c0b8dbc11de2b242877e692ec20 3efa12d7bfa0da7c09a42b2b43c50ff3985c55676db7f3be2c771765d81f9a10
 lib/codeql/rust/elements/RecordPatField.qll 7487461887e82bcf224b02628dfc64457121ab17e731e2dc7aa7e731ab16c02f f2018e55722245eb4273fb067242aaa503c43f91671a55b3a4bb51fe7bc0a03c
 lib/codeql/rust/elements/RecordPatFieldList.qll c3198c997f389ce95db377ca40ac69a1448f120093f37ab1c92a5a3f1f6aa0d4 9db36d274f1ec77c442ae7e38f940a65c9a92f1541f66140188b226965851535
 lib/codeql/rust/elements/RefExpr.qll 91a0d3a86002289dc01ffbe8daca13e34e92e522fbb508241a9d51faf1d4a9d2 b6e63d8e6f8956d2501706d129a6f5f24b410ea6539839757c76ba950c410582
 lib/codeql/rust/elements/RefPat.qll fe076bdccb454111b38f360837d180274ba8a003b4cffe910b5197cd74188089 2604c8bb2b0b47091d5fc4aa276de46fe3561e346bd98f291c3783cef402ba06
-lib/codeql/rust/elements/RefType.qll 5dc6012188d5baf36cd7bf0ebc127e28e98862a3f91ea4df2f9b9c962f3a395d ddb06ebe7fb92ad7bbe86cf182270e8494b74edf91b8c841aaf7ba932e5092ac
+lib/codeql/rust/elements/RefTypeRepr.qll ac41d8b4132f273d65873ea3c59631bc1718b3266ae08075346e6cb1bfe2f17c b7e34851d37008806d4519105a5e3405dda07b999294c6656a0c447ac1635b2a
 lib/codeql/rust/elements/Rename.qll 55fa06145f2160304caac0a5ce4cf6a496e41adfd66f44b3c0a1d23229ed8ce0 80262f0abf61749cdf0d5701637db359960f5404ad1dbfdd90f5048d2e7c315d
 lib/codeql/rust/elements/Resolvable.qll 213c0c157541002ddd61cc76cdc11386819aa59dff0a81780474cccb6b7fb211 cdcf807587f887493888341a1b6f9bed202b80b37cacc77041a256b05ff4d3d1
 lib/codeql/rust/elements/RestPat.qll a898a2c396f974a52424efbc8168174416ac6ed30f90d57c81646d2c08455794 db635ead3fa236e45bbd9955c714ff0abb1e57e1ce80d99dc5bb13438475adbf
-lib/codeql/rust/elements/RetType.qll 36ea39240a56c504d94d5487ea9679563eef3dfe0e23bf42d992d1ab2b883518 2fe5b6f62a634c6aa30a1ecd620f3446c167669cf1285c8ef8dd5e5a6ef5fc71
+lib/codeql/rust/elements/RetTypeRepr.qll a95a053e861a8d6e5e8eda531f29c611b00904d48ea2bb493138d94d39096ace ebde4f865d310351ba6ee71852428819627ea3909e341d6800ab268b1810c6fa
 lib/codeql/rust/elements/ReturnExpr.qll b87187cff55bc33c8c18558c9b88617179183d1341b322c1cab35ba07167bbdb 892f3a9df2187e745c869e67f33c228ee42754bc9e4f8f4c1718472eb8f8c80f
 lib/codeql/rust/elements/ReturnTypeSyntax.qll 0aa9125f5ea8864ecf1e4ff6e85f060f1b11fdd603448816145fea1b290f0232 3911819548ad1cf493199aac2ed15652c8e48b532a1e92153388b062191c1e6e
 lib/codeql/rust/elements/SelfParam.qll 7d720c99097a340bc7bf6cc27ac6fe291a04af53e9bac23bf070b04b36e6e033 736488794a46ea702dcd3f603134052598207f3953acce3c9237bd6c6a038b23
 lib/codeql/rust/elements/SlicePat.qll f48f13bb13378cc68f935d5b09175c316f3e81f50ef6a3ac5fdbfbfb473d6fc1 4c8df0b092274f37028e287a949f1a287f7505b7c2c36ee8d5f47fb8365d278a
-lib/codeql/rust/elements/SliceType.qll 7e49dba57826c7bb72a88f9e802febdb09adfc49804f6205dc88f2a307fd1f30 6c3ee430f812f1d9fbb1fb1fdd2c47130a4bde7fccf17f09404b8cbc8104678a
+lib/codeql/rust/elements/SliceTypeRepr.qll 4f3fcb2b457ba95c76a1ff786e6fc217ad1a5f570dac68ec5da4b9a37c963186 b3f524d744d3fcef85a2e1e175b99a8e3acab36b2a717f107272ed92a48940c0
 lib/codeql/rust/elements/SourceFile.qll 5916d550385d618bd3b3d4835fbd3040485822220af8ce52ee1adb649b3d8594 0b79766216649e948fa59de467d64fa752de4666c28e0e503e88740ae27a2aef
-lib/codeql/rust/elements/Static.qll 1e25940c774538de9b1aea877e20e34b672d6a3ed3b56a741195995f051c5acd 94f09d08b35decc6990c0cab23354f84aa8ef271ea1a77a233c9fcd6ab14c643
+lib/codeql/rust/elements/Static.qll 439550ae01b4975dc08867ecdc1f8a4da0127321af9511857a006e6bdf6400b0 e83252e8bc06045322bd2cbadd5a2c7deb82b8a11ddbc9809d3e199056f57bee
 lib/codeql/rust/elements/Stmt.qll 532b12973037301246daf7d8c0177f734202f43d9261c7a4ca6f5080eea8ca64 b838643c4f2b4623d2c816cddad0e68ca3e11f2879ab7beaece46f489ec4b1f3
 lib/codeql/rust/elements/StmtList.qll 6f990782d5a5307d6d8a3256eb510aedfdaf7bd0e45f3dff35388842ab487b8c b412a27dea0c67307ab79104d45c5b4848c3191cc983e8b0d8dfa739a1b65d9c
 lib/codeql/rust/elements/Struct.qll 96b7020c7670d5ea7effa6e390d3a163dba05ca5206cfdd1284f4a41e5664c6a 3fea0d13b8da0f210f3ad9004189efc3c56bcc90e67d6ef7817c6767f6aff273
@@ -144,17 +144,17 @@ lib/codeql/rust/elements/Trait.qll f78a917c2f2e5a0dfcd7c36e95ad67b1fa218484ee509
 lib/codeql/rust/elements/TraitAlias.qll cb2af66ca1da20122b800097dbaaa904e5b6e753571fcfd6821e779be273d742 da8666db52609a5d04b847dfcecf753644f813597d58a4aa1a7e2d35ede96ef8
 lib/codeql/rust/elements/TryExpr.qll d2c5eb215f1b46a86b82e7d99fe1dcfb2b4cb42811f331e54cc602b40a10a0eb 8c207264924428e969060f4cb903b37e27f8ff74e45be7d13a2ead44a572b36a
 lib/codeql/rust/elements/TupleExpr.qll 561486554f0c397bc37c87894c56507771174bfb25f19b3bf258a94f67573e56 d523246820853ff0a7c6b5f9dbe73d42513cadd6d6b76ea7e64147140ac93c15
-lib/codeql/rust/elements/TupleField.qll e58d024fc41519b559eef36cf6081d03a786b05357e4322e7046092131ea508f cad861b23fb4cdf2fbe90595de0e4776f1db9b69c3f3825221e475bc92895351
+lib/codeql/rust/elements/TupleField.qll 2e78c52e3f5b3cfa59231c864f7d44fbe9c1ec43f8310f9250817bd7a88369b6 71466032bb32a0f6d64c5d8902587c2fa36cdece53799d3e03ece06e384e85f4
 lib/codeql/rust/elements/TupleFieldList.qll 73397eef1cf8c18286b8f5bb12fbdc9bb75eee3b7bd64d149892952b79e498a3 13ac90f466ab22e5750af9e44aff9605b9e16f8350b4eaecff6a99e83d154e25
 lib/codeql/rust/elements/TuplePat.qll 028cdea43868b0fdd2fc4c31ff25b6bbb40813e8aaccf72186051a280db7632e 38c56187971671e6a9dd0c6ccccb2ee4470aa82852110c6b89884496eb4abc64
 lib/codeql/rust/elements/TupleStructPat.qll 16a3f10992db62cc6630dc962a2a0d243c41b8aca064d6cb6c82a2f4e6987a12 c2b4c14567ee2dd65e0b643c9d18dfe5098fb3bd4ed45dcc825065bfa7c7c02d
-lib/codeql/rust/elements/TupleType.qll b5c798f7c9b08c8a6cc0a57fc5c36d714e70d5e955a9e87b6b309c18365d7596 ebea533ab126392344d080da1bc9efabcabb5397e93c9d213ffc71a61bb8d47c
-lib/codeql/rust/elements/TypeAlias.qll 64780697f5869266345d040fdaee05c62b8670b9b5c6369692f9a9dc646986fc afcc7617d0e2e16d92d2a53c3e6661fd184bf5cf21b154f121dbf4d3b7ab30e6
-lib/codeql/rust/elements/TypeArg.qll 39aea9a9f0b74e8b90e957dbc3ce593cbdb1d2e0d9320428ce2e9cbfcb772e53 f1f2612633de9f534faf76c368b6154a8dc20feb9297262fcb10a8f192aa2e02
-lib/codeql/rust/elements/TypeBound.qll 3549a2ded6dbe401a49690c7b7c1d629d55dae2347380ee0e0632d3b64f200e7 e407603af5bc1ba2704a457eaa7fffd8c52cb13b3ccfc9ef477ad120ff8e98a1
+lib/codeql/rust/elements/TupleTypeRepr.qll 819b600abfb2d6110e3f9c09a3901c875530acf372c65e3d9071aed8ab302cbb 508e8e527248b42ba3f20d3ff5163c348c9d338b12ff7d244246fc711e9d240c
+lib/codeql/rust/elements/TypeAlias.qll 2974953465e096fee61c70199a5672174254494786bc762c32c84df97422f08b 55e634e3dfa6ea3980ab37a524ea60c6adc207114a313c0c2a3632f7b5583dab
+lib/codeql/rust/elements/TypeArg.qll 88b5d150dbb207079bf40019b60eb6f5389247aa3040474729019d2be48e92a6 6a507290152be04b1d2c4e2c04214cfc87c583ed0611bd75655aff59eb8ce952
+lib/codeql/rust/elements/TypeBound.qll 0c1629a7e2bce7e6f603e1209cd5b182b9bb61fa4c287bc4276d40cf004011e5 40c6f1d099f35be61ce721d3ee921c14722190b50874f87035036ef14ed2fb68
 lib/codeql/rust/elements/TypeBoundList.qll a0b95aa95485a0e23b9198ca492ea3fa075fb0dc9fb40ba997aff35d70c51d3b 51de36a56cd2921758260c62cebeb96e703d10b226ca505c874ae54c5a981348
-lib/codeql/rust/elements/TypeParam.qll e06ed282dd55dc68970265706a22499c8ec4ea8c3459d11e20549eeb5504e2b7 479826e69d2a9189f66962b17f55c62df89e297623f38287eb296ec78487a1a6
-lib/codeql/rust/elements/TypeRef.qll b180dc4fe85d0eb3032ed3a63aea54ca0b667a6a00f2fa0505fa742bd89d6927 b0210ee96929ca0f335955f76d2a0c06ce32201b8bb45d8424aece786ed6dae5
+lib/codeql/rust/elements/TypeParam.qll 1ed46cf5b687e75fd062142114197354422dc7378f637a93bcd26038d7a51cfa 89ec428bda92d44c265263886ad427032dbced6169b405af0cd51f0a981fb587
+lib/codeql/rust/elements/TypeRepr.qll ea41b05ef0aaac71da460f9a6a8331cf98166f2c388526068ddacbd67488c892 11a01e42dab9183bac14de1ca49131788ede99e75b0ef759efcbc7cf08524184
 lib/codeql/rust/elements/UnderscoreExpr.qll 233661b82b87c8cda16d8f2e17965658c3dc6b69efb23cb8eb9c4f50c68521e0 8edff8e80aac2ecf83a6b58f310cab688cbaeea0a0e68a298b644e565960cc74
 lib/codeql/rust/elements/Unextracted.qll 12e60c79ef5b94d72b579b19970622e7b73822ebc13fbcfedfe953527ab1ac36 ec015db2eb12c3c82693ddc71d32d9ab9ef7a958e741e2510681bb707ceca23e
 lib/codeql/rust/elements/Unimplemented.qll bf624d28163e5c99accda16c0c99f938bec4a3b1b920a463e86fc8529ff5ff02 013bc7777298d250338f835cd494b5a8accea2d6a4f9561851f283ac129a446b
@@ -166,7 +166,7 @@ lib/codeql/rust/elements/Variant.qll 328323ef59faf01dcf71e7d728fd10a60465a1bd24e
 lib/codeql/rust/elements/VariantList.qll 07adfe5750b2d5b50c8629f36feba24edd84f75698a80339d4cee20f4e95829d 7d322e60c84ea45f8c8b509226da7ae3c0125bcda42a98a94e3e6a9855cab79e
 lib/codeql/rust/elements/Visibility.qll d2cf0727efaf8df6b3808cb4a6b2e26d18e42db766d92e97ad3ef046d91cb9e5 8947a1e2d48b532c6455ddf143fa5b1dff28c40da1f1c6a72769fc9db7ecbaf6
 lib/codeql/rust/elements/WhereClause.qll da51212766700e40713fff968078a0172a4f73eebc5425d8e0d60b03c2fe59fa 0ec036aea729b8f4af0eb8118911dce715e2eb4640ae7b5e40a007a48da03899
-lib/codeql/rust/elements/WherePred.qll 4815cd8f2a536c895e1f6831bef2ee6b9ea42c4fea12df1f164de1c965795bc1 3b46806767d81218d2e21656afe39c957c364ff7067c9af3ae8bacbf7f93858b
+lib/codeql/rust/elements/WherePred.qll 595ae1b4f9db7308f25fbed04f4f2e44fc64dd6384c2c173ff20b645cfeaad9a a4dbd58a9f8cf5b37b3b630f18ee26c58bb267b7cade132532b71288864b0f95
 lib/codeql/rust/elements/WhileExpr.qll 9e0c23057bf3fa3e050d5f6de0650f554ce576861783ea7d1e4c7d35db129ad3 b294c4f6e4dea922a4274779287edcb484409b2654a553298626ded9d1e8c5a4
 lib/codeql/rust/elements/WildcardPat.qll 4f941afc5f9f8d319719312399a8f787c75a0dbb709ec7cf488f019339635aab a9140a86da752f9126e586ddb9424b23b3fb4841a5420bac48108c38bb218930
 lib/codeql/rust/elements/YeetExpr.qll 4172bf70de31cab17639da6eed4a12a7afcefd7aa9182216c3811c822d3d6b17 88223aab1bef696f508e0605615d6b83e1eaef755314e6a651ae977edd3757c3
@@ -179,8 +179,8 @@ lib/codeql/rust/elements/internal/ArgListImpl.qll 19664651c06b46530f0ae5745ccb32
 lib/codeql/rust/elements/internal/ArrayExprInternal.qll 07a219b3d3fba3ff8b18e77686b2f58ab01acd99e0f5d5cad5d91af937e228f5 7528fc0e2064c481f0d6cbff3835950a044e429a2cd00c4d8442d2e132560d37
 lib/codeql/rust/elements/internal/ArrayExprInternalConstructor.qll f9756bc40beee99c5e4355bf157030b440c532dff5bdf43e848b3aa1a00fea90 39467f7f313e6f9ede1fe92375ee408098dc65291ca8ee50e36a3684a2767836
 lib/codeql/rust/elements/internal/ArrayExprInternalImpl.qll ae4488846c8309b2d4a51d54b36fce0a75107917c0b1f8af5ccf40797f570580 37838c7d6a04b95a16ed46e963d7e56def7a30b5e5ef1ab7e0dfdb5f256fa874
-lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll 9e92e6c40df992b4d71ae0e80392e81499604c7586a671b89d31d2d98060380e 76a1915a88f50ffa60bf129237bae2d66cf26d2a9018aca8ccb343929e847531
-lib/codeql/rust/elements/internal/ArrayTypeImpl.qll e22d4f4eb21ba1ea44dd53e0c80aa60ec3a42818c1fc2d512c92dc496a6e2cb3 1b4a7347dbb9310ace1e9e3d08c3ba53c1dc441539cebcb4a78f64a58097bc0a
+lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll 52fea288f2031ae4fd5e5fe62300311134ed1dec29e372500487bf2c294516c1 fa6484f548aa0b85867813166f4b6699517dda9906e42d361f5e8c6486bdcb81
+lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll ee16057197a489e6539c256d59f615636610022ec920fef93d36abf051c8687d 39a86b29d94f6d3b422161f0b1db6d0462c149bd465d60bfc82d383dd891c63b
 lib/codeql/rust/elements/internal/AsmExprConstructor.qll 36c68023b58beec30af9f05d9d902a4c49faa0206b5528d6aad494a91da07941 4d91b7d30def03e634b92c0d7b99b47c3aadd75f4499f425b80355bc775ea5b6
 lib/codeql/rust/elements/internal/AsmExprImpl.qll c34419c96378e2ae2ebb17d16f9efb4c97d3558919c252be9203aee223ac30a2 1d99c8fa35fabf931e564383c06c95fb39201fd588b759d28aef2fda7ed2c247
 lib/codeql/rust/elements/internal/AssocItemImpl.qll f462dacb8e60db8d8ffae44307c990370210c57b66721fd072c34b5ae76d3cc9 7fdb8faff0f310c1cb2bdd52f18368c8d78873467800c41ab3d1989f3196d845
@@ -213,8 +213,8 @@ lib/codeql/rust/elements/internal/ConstImpl.qll 7aac2b441a41f21b7d788e3eb042554f
 lib/codeql/rust/elements/internal/ConstParamConstructor.qll f6645f952aac87c7e00e5e9661275312a1df47172088b4de6b5a253d5c4ed048 eda737470a7b89cf6a02715c9147d074041d6d00fd50d5b2d70266add6e4b571
 lib/codeql/rust/elements/internal/ConstParamImpl.qll 909d85d857dfb973cd8e148744d3a88506d113d193d35ab0243be745d004ad45 c9e18170c5b4e4d5fca9f175bb139a248055b608ceafdd90c7182d06d67c3cba
 lib/codeql/rust/elements/internal/ContinueExprConstructor.qll cd93f1b35ccdb031d7e8deba92f6a76187f6009c454f3ea07e89ba459de57ca6 6f658e7d580c4c9068b01d6dd6f72888b8800860668a6653f8c3b27dc9996935
-lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll 2bfd81fdf116b76f4a62b47bed5f0a730c04ce79747ecd1d3b683b8de22ff4aa 375c57350c432351396b92f28fded1e95a8002e3a1b31f3b66039f9b3d9bdea9
-lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll 8ccf27db0b898f518874ae094e5c97206384ad2fd3f82f81a5ecaad953278f71 e28ab56b8814a804e23afa790ca0f9a2665195b0b316d6cc52936e76ce5c0011
+lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll 6964e6c80fb7f5e283c1d15562cef18ed097452b7fcbc04eff780c7646675c7a f03c4830bf1b958fdfb6563136fa21c911b2e41ce1d1caee14ec572c7232866d
+lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll fa2dc41b441c2e8d663644ca8ae53f473ac54b3c977490b5173787cffe4a62b1 118945a547627b639574c5f8e58bf7dbf5f3882c6d74ebf363c28c8fb88799d3
 lib/codeql/rust/elements/internal/EnumConstructor.qll eca1a13937faacb1db50e4cf69d175f992f2204a5aaed9144bb6f3cb63814ac5 1bafba78b2729fdb052a25a1ba3f4f70871564aa4df632b4a1d467858a437924
 lib/codeql/rust/elements/internal/ExprImpl.qll ab20ee174e2e786f34af6e5dedf3ec071bb89fc266b3e91df6377f72aa38d3f2 f68192700f449bf1c229cfbaabd5353c7c559941c915d5a0c88752cf9844194b
 lib/codeql/rust/elements/internal/ExprStmtConstructor.qll dd6bb06a7d48c12f630aafd611621cc50ce0f3e7d9abba5484a695f90879264b dc8b6ec8acc314e041ae71868803630c5d4cab488c72c1ea929bb756e1847c52
@@ -228,11 +228,11 @@ lib/codeql/rust/elements/internal/ExternItemListConstructor.qll 9e4f6a036707c848
 lib/codeql/rust/elements/internal/ExternItemListImpl.qll e89d0cf938f6e137ba1ce7907a923b1ab2be7be2fdd642c3b7a722f11b9199f8 85906d3ce89e5abc301cc96ea5104d53e90af3f5f22f8d54ec437687096e39d8
 lib/codeql/rust/elements/internal/FieldExprConstructor.qll b3be2c4ccaf2c8a1283f3d5349d7f4f49f87b35e310ef33491023c5ab6f3abc5 645d0d4073b032f6b7284fc36a10a6ec85596fb95c68f30c09504f2c5a6f789f
 lib/codeql/rust/elements/internal/FieldListImpl.qll 02a09d1d146030c68cead4614f4eef75854f19e55ed1eda60b34c4858a8d4a88 9b9f5e77546434c771d2f785119577ec46569a18473daa4169fb84a097369493
-lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll 494c53ee599039c02145f91394d8dfe7635b32d03f9fcde5efcc99ced437fec8 992462b1b6b9e64b6201f3c6c232ca524f126efcb562c9f0c176677bb559f33c
-lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll 5d70f71e08341dfa851fc53a47cf362786b57f44244a636e2fbbad3d1c41371e 51d6a1b1132204129bb8ee9d2b72c6d13ce4b3ec8b185d3732d2e64d3f80e807
+lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll 61d8808ea027a6e04d5304c880974332a0195451f6b4474f84b3695ec907d865 0916c63a02b01a839fe23ec8b189d37dc1b8bc4e1ba753cbf6d6f5067a46965a
+lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll 23b1309f267b640efe9458429feea986fc66a15ce1496883c292d8700637bbc3 b8785911a504d6d48be3e9dd1a150cb2611bd70ac420433e1f78ce1310c284f1
 lib/codeql/rust/elements/internal/ForExprConstructor.qll d79b88dac19256300b758ba0f37ce3f07e9f848d6ae0c1fdb87bd348e760aa3e 62123b11858293429aa609ea77d2f45cb8c8eebae80a1d81da6f3ad7d1dbc19b
-lib/codeql/rust/elements/internal/ForTypeConstructor.qll 32c40b78aded314b5f51af904bfbd5ae4f1f0ea65854dd6249983cc26b8601bc 729069d58fac648a4b212b0068fb6bca348443b502c38978f171a7539b24333f
-lib/codeql/rust/elements/internal/ForTypeImpl.qll b515639844778d0fbe51e6161a2ec19201b0ba15156a91cdfecc93523081fd61 ab0c09ee415e55db6abcc07493a5d880c5ae0974f0cb760194e40b68a961676b
+lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll eae141dbe9256ab0eb812a926ebf226075d150f6506dfecb56c85eb169cdc76b 721c2272193a6f9504fb780d40e316a93247ebfb1f302bb0a0222af689300245
+lib/codeql/rust/elements/internal/ForTypeReprImpl.qll 5595a576085f032f056c0c5c4e78076b60520df420396fbc785eb912a88fa2b2 e8ee94d7722ece3483872411f60a7b01f1c2578823b0263236f25eedd2c2a6ac
 lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll 8bd9b4e035ef8adeb3ac510dd68043934c0140facb933be1f240096d01cdfa11 74e9d3bbd8882ae59a7e88935d468e0a90a6529a4e2af6a3d83e93944470f0ee
 lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll 601f7715e9a65bcfa7cea1979fa30d694b5bea29650d799d7dd3080b8eea58e9 ecb0800cdb8c0f93277982dad295ac6a5332e42eff4fb5c8ff19f903b9857003
 lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll ce29ff5a839b885b1ab7a02d6a381ae474ab1be3e6ee7dcfd7595bdf28e4b558 63bf957426871905a51ea319662a59e38104c197a1024360aca364dc145b11e8
@@ -245,10 +245,10 @@ lib/codeql/rust/elements/internal/GenericParamListImpl.qll 524aa0949df6d4d2cb9be
 lib/codeql/rust/elements/internal/IdentPatConstructor.qll 09792f5a070996b65f095dc6b1b9e0fb096a56648eed26c0643c59f82377cab0 0bb1a9fcdc62b5197aef3dd6e0ea4d679dde10d5be54b57b5209727ba66e078b
 lib/codeql/rust/elements/internal/IfExprConstructor.qll 03088b54c8fa623f93a5b5a7eb896f680e8b0e9025488157a02c48aaebc6ad56 906f916c3690d0721a31dd31b302dcdcec4233bb507683007d82cf10793a648f
 lib/codeql/rust/elements/internal/ImplConstructor.qll 24edccca59f70d812d1458b412a45310ddc096d095332f6e3258903c54c1bb44 7eb673b3ab33a0873ee5ce189105425066b376821cce0fc9eb8ace22995f0bc7
-lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll b47501280b026a4e9c21ace21d9ae59f4d126a3a1e03a6088ca38cd676cc4f6d 3b0b325ab0139b290a81355559227050ba3096a58f9ff01c4c0f5c5fb5beb6ee
-lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll 9826a676525c98c30019f62f3c5943b4f62f278ed738dcc023d15f82f36a9d32 da369a61b95685c29fce3c07082d2a58ab633d526d094fa9eaefa82f564609f6
+lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll 1ed355e5e56f432b24b6f4778e4dc45c6e65095190cacb7a5015529e0c9d01f8 c8505185a042da4eb20a0cc32323194a0290c4bf821c7e0fce7351b194b10f31
+lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll dde9a7d09cce9c83299ce7526f55ff8ed7601fdfb7f76c9b90380b25f0e4fc43 c521e2a24915b617cd9c44726f26056b606f78901e1e6d47cf68efb5f67dd5d7
 lib/codeql/rust/elements/internal/IndexExprConstructor.qll 99bdc3d793c4dbd993860da60abe2b7c604345d645e86916462bc55a6939a5d1 3fe9d7da725956903707806aadbecac8d5b3874e8bed63c9bab54fff630e75dd
-lib/codeql/rust/elements/internal/InferTypeConstructor.qll fb8f2aec6cd1e681cd84a7bd574459e19b9b2a152009290e2eac550f012a06b7 e2b1694f00a4e6a82b13d08d7bb95c98a73792370c1155263d696e60d39b2c3b
+lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll bc5f16853401617fc9c5af8a1287a23c5921df1b615cfbe2d7c7a70145ecfcbd da93bd28ea2daade2cbb0a729be3fbf05f72bc02009565c7bb062e4f68fdb9e7
 lib/codeql/rust/elements/internal/ItemImpl.qll 3eaa97dcbdb8870acaebc1e11a37a5cfdfa200751461e54d3a52ca48b90ba9bd 41fbd1110b0e24f4d5a3deee0a51c02d206178111a361a1e94501ca1ab70d7f7
 lib/codeql/rust/elements/internal/ItemListConstructor.qll 08af3bd12536941c3dd4a43c81cc861be24325e242e2593c087a3ce632674291 2fa166159c409d2aaffa73a30babb40829a6de580bd40894d909ee6152801082
 lib/codeql/rust/elements/internal/ItemListImpl.qll fb27417bb3ee17a739ae966dd7c6f382bc2a1de3e7efdfe1586d76a257c0b573 dee7ded650df8ef46b2ac9d472718536fd76dffee86bc208b5a6144060221886
@@ -278,8 +278,8 @@ lib/codeql/rust/elements/internal/MacroRulesConstructor.qll dc04726ad59915ec9805
 lib/codeql/rust/elements/internal/MacroRulesImpl.qll 10c03adfb63ee7a4348ff5cffc6ef5300a531b048f28811a51e940b053e69f68 2498bd64aeaea9849c086abeaa6c248e4ce41b4436155f4bd4840965976d5d54
 lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll c293815cd69c002ba6de1db6018672654420f3f8bdd143f9d0c620adddd2be02 d376f8f07661a8cad1b10039076fd7fca353dcacf3ca40ed6507b8c874e849ca
 lib/codeql/rust/elements/internal/MacroStmtsImpl.qll 27faff9da93ad7f22a6236c73ebb4d4631161cf4ec1b82958cdf79c85aa2087c 7e2863eaf50d4b285b9240f2c5ff9497cfb4393c8528a0738d725d00f1a78406
-lib/codeql/rust/elements/internal/MacroTypeConstructor.qll 0a23573a6f69b38f3d7470050b16197601d67bdd5a4b1a43a155b0b99ccdf6b5 19b623962e8e1f73e55e3ed9712d2a3fe84b9510b99062173902feb2458ec12a
-lib/codeql/rust/elements/internal/MacroTypeImpl.qll b8711279f09f521b05bb67568c089271b7913f863ee64dfdeec2c502de2cbdc8 51bd9d3a2fb2065bce7b193b485e225ca5c8ba2029e60cab427d43a90baf0880
+lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll cf8a3bdcd41dda1452200993206593e957825b406b357fc89c6286cb282347ac a82279485416567428ab7bff7b8da7a3d1233fb1cfcdb1b22932ff13bd8c8ec9
+lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll 8044498e426597c767308b0bd8894402f7b30f334c71970d7a09dae5e25dd74d c0d566147777f562055727ebfc255e81dfb87ee724782a5a0ceb02f57597c7a0
 lib/codeql/rust/elements/internal/MatchArmConstructor.qll b41c1d5822d54127ce376ef62c6a5fa60e11697319fc7d9c9c54fd313d784a93 96cca80e5684e5893c0e9c0dff365ef8ad9e15ff648c9969ba42d91f95abea05
 lib/codeql/rust/elements/internal/MatchArmListConstructor.qll 8bc5ac978fe1158ef70d0ac06bdad9e02aadd657decb64abcc4ea03f6715a87a 4604ab0e524d0de6e19c16711b713f2090c95a8708909816a2b046f1bd83fe24
 lib/codeql/rust/elements/internal/MatchArmListImpl.qll 896c6f1650e7ceb60d0b3d90e2b95fe7f8dc529203ddfec58edb063fa9b2871f a668fed1eb68806abfb021913786168d124de47b25da470e7b57f56bf8556891
@@ -294,7 +294,7 @@ lib/codeql/rust/elements/internal/MissingImpl.qll e81caa383797dfe837cf101fb78d23
 lib/codeql/rust/elements/internal/ModuleConstructor.qll 31cc83c9d8f25ac07375d19e568f05c068e1f5aa205ff3d9ac31c2510e6f8468 8a70f3f1c18ff87f17e6baf2f05ccaed55c70469288192fc39ef0bb5531b8c0e
 lib/codeql/rust/elements/internal/NameConstructor.qll a760134c6d4fc785746e1a5dc042a6bf25b8adaa3947a6897c31e50fd91dd5fd 1359f903d57112bcc1f62a609febb288301bfa810e569aa12e1045fd48b5b5c9
 lib/codeql/rust/elements/internal/NameRefConstructor.qll 5ff6eacc614fd41f98b54cbb4960a07a1471cf4ea291758d33e54a48fd5d1bc4 c538d65414a24dfdbeb49cfd997588227559ba038f0b55d14bb5d89ed1a016f2
-lib/codeql/rust/elements/internal/NeverTypeConstructor.qll 6a86bff9d885eddf39a159698710def40d693ccfd0888aefd090a283cb59ae95 9c51d6569f267dde5597067a8470d19d7714304399de4f730e7b85ca21feee20
+lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll 2e0a9c75e389e9ef41a18dd9b5d6c29ffe1d1d633e51ef1de90ec553236d201a 61ea87802fd1c3a68e864ccd76657253a228b06471e4c55bcf94ca2be554f866
 lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll 616e146562adb3ac0fba4d6f55dd6ce60518ed377c0856f1f09ba49593e7bfab 80518ce90fc6d08011d6f5fc2a543958067739e1b0a6a5f2ed90fc9b1db078f0
 lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll e52d4596068cc54719438121f7d5afcaab04e0c70168ac5e4df1a3a0969817a6 6ab37e659d79e02fb2685d6802ae124157bf14b6f790b31688f437c87f40f52c
 lib/codeql/rust/elements/internal/OrPatConstructor.qll 4ef583e07298487c0c4c6d7c76ffcc04b1e5fe58aba0c1da3e2c8446a9e0c92b 980a6bd176ae5e5b11c134569910c5468ba91f480982d846e222d031a6a05f1a
@@ -303,17 +303,17 @@ lib/codeql/rust/elements/internal/ParamConstructor.qll b98a2d8969f289fdcc8c0fb11
 lib/codeql/rust/elements/internal/ParamListConstructor.qll 3123142ab3cab46fb53d7f3eff6ba2d3ff7a45b78839a53dc1979a9c6a54920e 165f3d777ea257cfcf142cc4ba9a0ebcd1902eb99842b8a6657c87087f3df6fe
 lib/codeql/rust/elements/internal/ParenExprConstructor.qll 104b67dc3fd53ab52e2a42ffde37f3a3a50647aa7bf35df9ba9528e9670da210 d1f5937756e87a477710c61698d141cdad0ccce8b07ecb51bab00330a1ca9835
 lib/codeql/rust/elements/internal/ParenPatConstructor.qll 9aea3c3b677755177d85c63e20234c234f530a16db20ab699de05ca3f1b59787 29f24aed0d880629a53b30550467ade09a0a778dbf88891769c1e11b0b239f98
-lib/codeql/rust/elements/internal/ParenTypeConstructor.qll d62e656a4a3c8ffd4eb87d49585a7a3bfb5dbe3826fbcbd11cb87b46f34c19ae febf6535965afa0f6eac4d2b08730f5a07bbb36a7434abe0a7663d7264961a3f
+lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll b3825399f90c8546c254df1f3285fe6053b8137e4705978de50017be941c9f42 696fa20ce5bd4731566b88c8ea13df836627354d37cc9d39514d89d8fb730200
 lib/codeql/rust/elements/internal/PatImpl.qll 37c9b1da7aa625117644e2cd74ec0b174f69a38cf66926add01786a05d5ad2ad 143685a0b4873fa0b73b204285dca956e59b32d527bfac6cc336326d244994b7
 lib/codeql/rust/elements/internal/PathConstructor.qll 5c6354c28faf9f28f3efee8e19bdb82773adcf4b0c1a38788b06af25bcb6bc4a 3e2aeef7b6b9cda7f7f45a6c8119c98803aa644cf6a492cf0fce318eba40fe8f
 lib/codeql/rust/elements/internal/PathExprBaseImpl.qll e8b09447ee41b4123f7d94c6b366b2602d8022c9644f1088c670c7794307ab2e 96b9b328771aaf19ba18d0591e85fcc915c0f930b2479b433de3bfdd2ea25249
 lib/codeql/rust/elements/internal/PathExprConstructor.qll cf6e0a338a8ed2d1042bdee4c2c49be5827e8c572d8c56e828db265d39e59ae3 36a3d1b7c5cc2cf527616be787b32071b9e2a6613a4f6b3f82e2a3b0e02a516f
 lib/codeql/rust/elements/internal/PathPatConstructor.qll 966c4ea22218ef71e000d7ce8dd5b570c39ad96b9239a3aa8a38292e2a9f36d2 8a1f348e9257ffc6e6bedcd70389b8e7ec2a3ed6e7b3733744ddfab284826e57
 lib/codeql/rust/elements/internal/PathSegmentConstructor.qll 2d9639e42035dc7e73b7d6ddb8a977beadc6b4492dee4292b2f85b4409344441 c337fc3b9ef56366428772563e3f25f711474d16e860d3e89c1395a95d9e83e7
-lib/codeql/rust/elements/internal/PathTypeConstructor.qll 8949742c7ab7fcfa3a3f6469e87355a6888931ab9ac7a6a07d2bd51e3fdf8283 fb1a402e94e9a1f33b7757338d7e95b107933339615a4fe86de33e41206dd94a
+lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll e05e7be13d48e7f832e735254777692d4be827a745b1fd94b9649d46fe574393 4aa1e6935a4479b61f205265cbbba01ce96d09a680c20d5decf30d1374d484d4
 lib/codeql/rust/elements/internal/PrefixExprConstructor.qll 90c50b0df2d4b4cbf5e2b7d67a9d243a1af9bfff660b7a70d8b9c7859c28bca7 1a1b5ea1f06ed8d41a658c872e8e1915c241a7c799c691df81b9a7b55d8f2f1e
-lib/codeql/rust/elements/internal/PtrTypeConstructor.qll ee3c4326ea3f198d2537a914dd6eb51d0cf247310f037e13e87632fbd6cfb50a 3814218b5271f3c6c45b52082cca2a3250a2573abced43fe53e1b4145374afe3
-lib/codeql/rust/elements/internal/PtrTypeImpl.qll ff4283ffab39b4a3c0e55e7d655dfdb846171cde0907bf1f893c86b35d2c1135 e54d3a6fb0b5a1484f00fd5a4631455902bab80642c3bb076e538ddcc29a85a4
+lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll c8bd3502dc23429577fbff0fe3e3c78b812b2237b2bb65862c137083fdaa7a4a 4d5c135be30f71a3712acbc22bdb6c425fa6463043a9ee64543da31151d68366
+lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll 82bb14c7c5764aa6c829d463ed7fb2a8a936881e6f499c8d02fb0964d2f663e6 0a297e11635a7eb7a29989e7ce867f7ac38bc45b6796a0c823c88784def52449
 lib/codeql/rust/elements/internal/RangeExprConstructor.qll a0aa90a1c38c5deea56475399016afae2a00a858b961fbbab8ddeb3bc6a08103 0ddf1bcf28aafc56d7334e6138fb268f9b36a429e4cbdd982cd8384e0644076b
 lib/codeql/rust/elements/internal/RangePatConstructor.qll fe4345cb41d970ab64196ca37eccb26e5b9cf85fab4253cacfd2b31de03bd070 1d09d5ec8203d76aed2dfb7e7f14c0c07d6559c8f589e11860fff8a2c682c1a6
 lib/codeql/rust/elements/internal/RangePatImpl.qll ef11ab2c002896036553231741a7cf896fafa09e22e920e15661b9cbe4393cae 24ac2dcce3055a77f3a5e0b38cf13aebefd2eeaefa53674ff144a6225634ac0d
@@ -332,13 +332,13 @@ lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll b8f0ef9b75ff
 lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll 2d1dd9910480eb65c59fcef2e1576ce639be85c35d90e4bce721ce22ec742ba3 1e788a2d7d00e9f96dbf7e93d3a18d5bfb4d7749194ff8e9810e9053fa88a94b
 lib/codeql/rust/elements/internal/RefExprConstructor.qll 9ad08c0f3d980a56a2af8857cb84db589941d20ab3ae5c8ece004ccaccaaf950 4cac3ace31b7ed77a72e989fce9cdbae2247f03c28a3f0c50d67385d02c7f193
 lib/codeql/rust/elements/internal/RefPatConstructor.qll d8b88c2c468b08072f6f853306eb61eb88ee1e6c5cfb63958f115a64a9715bb3 0c1d6a8af6a66912698acce47e89d4e3239e67f89c228a36a141f9c685c36394
-lib/codeql/rust/elements/internal/RefTypeConstructor.qll e1952aa69586b440f878400a52d09b2d12d5a29dbe9651360344631cb9493cd4 e4ae45e89472dfd4547d647c75e1635cf065a7d221ed60ed34554f265c0c5405
-lib/codeql/rust/elements/internal/RefTypeImpl.qll f72b760a8a26be21170435da2cb2981638513617fd82742f45f38bc437d9f2c4 f32df49f0b6df85ca5fc4393ccd341ac4304b4947a282ccea48468a26837ef3d
+lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll 8e7012b456ebf1cc7a2c50892c0fffd51f0d5d83e417e1d4cabd4d409e3dddc0 4f3c6368bcea5e8c3f0b83591336f01331dc6dabf9c1e8b67de0fc4d640f65f0
+lib/codeql/rust/elements/internal/RefTypeReprImpl.qll dacd6fa69d2ed4b8899c64256c543b735c02e94823268e3c73bd29b528c855a1 f574ecfa50e1ffee5787422c7babdf19121bd8e31e3520f776b1dd706349d6b6
 lib/codeql/rust/elements/internal/RenameConstructor.qll 65fa2e938978d154701e6cac05b56320b176ee014ef5c20a7b66f3e94fd5c4a7 dfc0ff4606b8e1c14003cc93a0811f4d62ec993b07ff3c1aa0776746577ed103
 lib/codeql/rust/elements/internal/RenameImpl.qll 4f5943fbda4ec772203e651ed4b7dd1fb072219ddc0cb208c0a0951af5e72bd6 b9854cdcf02e70ee372330a4e0bfdb03012bc81af79dd12af2a567fd7fc4672b
 lib/codeql/rust/elements/internal/RestPatConstructor.qll 45430925ddf08fba70ede44c7f413ddb41b3113c149b7efc276e0c2bf72507b4 25c678898d72446e7a975bb8b7f2fde51e55b59dbd42f2cca997c833b1a995f1
-lib/codeql/rust/elements/internal/RetTypeConstructor.qll a96d803c6e4b40be49cfed0853a3e04ae917c47351e5c880fcab06eddf1af9cc d06a0a191cb14c270c0441ffc3d289263808170dcbe05e01847a35ac9d61dfb3
-lib/codeql/rust/elements/internal/RetTypeImpl.qll 0e96f1075ccade28ce5664ab0f5c2e98984ae1d0ed708bc02e40e882672d9e2f 350725d16bcb1e8911bfdd87d9dd21be73ec66d23c2a35827c8c8525c48dc885
+lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll 6dcb56c92a13f5ca2c9a8344bc05638cc611543896c578cd6ca185054f155537 3fe34953ba397dc31533bd28b48df76693e86b51c4a89c26ad4dfdbd816a0874
+lib/codeql/rust/elements/internal/RetTypeReprImpl.qll 394f7d8afe14776b4c629f8b6b98145ad75d62704856d2561a9d365abcf86621 753c445376da05ea2d3946254b767245cf54616bd8372f6fb3e82d4879e66f35
 lib/codeql/rust/elements/internal/ReturnExprConstructor.qll 57be5afbe20aa8db6e63c1f2871914c19c186730ad7dccaa424038c6305730d5 4d3c4f2e9b38a4b54ff26a0032455cdcca3d35fec201b6c932072a9e31fbb4fe
 lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll 8994672e504d1674e5773157d0ad8a0dc3aad3d64ef295e7722e647e78e36c11 abe7df754721f4ff7f3e3bb22d275976b2e9a1ef51436a461fe52ebd2d29cff1
 lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll d47a3dcfcc2b02a6a9eaeefe9a7a4be2074ecd2019da129dda0f218bc3fbd94b 87198db7c0620ed49369da160f09287015e0cd1718784e1ba28ec3ec5a0bb4a8
@@ -346,8 +346,8 @@ lib/codeql/rust/elements/internal/SelfParamConstructor.qll a63af1d1ccde6013c09e0
 lib/codeql/rust/elements/internal/SelfParamImpl.qll def23beb8926f498fc81b7b44489001b35d704da1a2058c84c23b329e8bc2f49 c9be1e8fa2c4e23b314a4d0563be6cffcbab6f03d08b77a366f7638b28a09de4
 lib/codeql/rust/elements/internal/SlicePatConstructor.qll 19216ec9e87ca98784d78b29b8b06ea9ac428e2faa468f0717d1c0d0a8e7351c 458e5be76aa51aec579566be39486525ec9d4c73d248cb228da74892e2a56c08
 lib/codeql/rust/elements/internal/SlicePatImpl.qll c6176095360e3b23382557242d2d3ff0b5e0f01f8b1c438452518e9c36ff3c70 644ab41a59a619947f69f75e2d0807245d4ddefc247efaeab63b99b4f08c1cc1
-lib/codeql/rust/elements/internal/SliceTypeConstructor.qll 643e7a2ae261e8f62de8bc2886efddcc096e0c7e8159c0b9e87b24d0509e10d0 719545abb0ccf6e8a203ec9c9f75109c5ab0593c838e2f90e388858680ec62f7
-lib/codeql/rust/elements/internal/SliceTypeImpl.qll a753aa9823b0288d3e8085faedb3a6bb750e98845a11a28b69796aa453c09c8e 343f5d4638b52e6eb0082000e1b147fe36173dcbfc035263819480b430c55127
+lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll 4576f203450767bfd142b1d6797b6482bb78f7700b6b410475b182d5067504ae 2b5aeaf91d5ea10e2370fa88b86bce7d0691d6d00f18ab8e1a1be917bb1619bb
+lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll e97dd1e8ff1c5d79f845d9bf3e3f190d4497bea93a806dbac97d62ecdffff7da d6c33bfcd3e8bf1cdf96ef95e25ac5dad19f20233f7f4f95c038f83ebb699c4e
 lib/codeql/rust/elements/internal/SourceFileConstructor.qll 1dc559887ea7798774528b5505c8601c61030c17480f7ffca49b68b76fcc0321 75a635b88622e3110b16795bd12ca6fc4af176c92d6e441518d60aa47255edc1
 lib/codeql/rust/elements/internal/SourceFileImpl.qll 0f844062989b363045f16488297f617d592cd90762befb7403f246d0b94a29c2 f38cabe8c34049f4454136bf7281aaef92d411dc41e686856b2058298b6cebc0
 lib/codeql/rust/elements/internal/StaticConstructor.qll 6dd7ee3fd16466c407de35b439074b56341fc97a9c36846b725c2eb43fd4a643 5bf5b0e78d0e9eb294a57b91075de6e4b86a9e6335f546c83ec11ab4c51e5679
@@ -375,8 +375,8 @@ lib/codeql/rust/elements/internal/TuplePatConstructor.qll 2a5e83ad5b8713a732e610
 lib/codeql/rust/elements/internal/TuplePatImpl.qll 4adb38f0f8dae4ff285b9f5843efb92af419719a7549e0ff62dc56969bd3c852 3f622130771d7731ed053175a83b289bab1d1f5931526c4854923dbcec7e43f1
 lib/codeql/rust/elements/internal/TupleStructPatConstructor.qll 9d68f67a17a5cec0e78907a53eccfa7696be5b0571da4b486c8184274e56344a 3ffa29f546cd6c644be4fecc7415477a3a4dc00d69b8764be9119abe4c6d8b9e
 lib/codeql/rust/elements/internal/TupleStructPatImpl.qll 896f001d82938bd018516a2b59ba5ad76350edb6b9747ed2ef5b96760aa16388 0552f9c0361d14be9896cbcfda17d8884d03a82c4f23c511a8de77fe71cfbb9f
-lib/codeql/rust/elements/internal/TupleTypeConstructor.qll 88eaec829cd4dcc6a152c7a335b1d365702ef410e46d9c04806fe53f06325b23 044fd0aca067bae82eb8ac448b7bcc66bc736e7e0ab8b770ee126381888fac3d
-lib/codeql/rust/elements/internal/TupleTypeImpl.qll 4d570a1d6c3d69d8f62f125c71f67dd90e982801905716d50292f2e652156948 1dcefae60448b21f85d46d252e314d67a9f2a90171e56351e08e2bc0a4077fb8
+lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll 80c31c25fd27e330690fb500d757a4bbd33f226186d88ea73bfe4cf29a7db508 d572a72fa361990a3d0a3f9b81d1e966e2ba1ac0a60314ec824c1b8b2814c857
+lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll 149719039d66f0cfb620e18d7af7e0995c5125a91f3883ad979e9ad480136d6e 310ef7e9e1e42853aa6a2c7bd9b8155773ff2b091d853059c7e04c8d5e30d723
 lib/codeql/rust/elements/internal/TypeAliasConstructor.qll 048caa79eb7d400971e3e6d7e580867cbee4bd6b9d291aafac423aa96c321e76 d1d1e33a789ae6fa1a96af4d23d6376b9d82e14e3cbb777963e2d2cb8b22f66d
 lib/codeql/rust/elements/internal/TypeAliasImpl.qll 43af0e8e3df8bca5b4bd48ad870cb619283710ec5b86085d85874a67cac3cb6e 75f1f8ba2bd722d55a84178cf338d34f7c57a156f8cc014bd2b29ee4da5ea9e2
 lib/codeql/rust/elements/internal/TypeArgConstructor.qll 51d621e170fdf5f91497f8cc8c1764ce8a59fde5a2b9ecfad17ce826a96c56c4 a5bbb329bde456a40ffa84a325a4be1271dbde842c1573d1beb7056c8fb0f681
@@ -387,7 +387,7 @@ lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll 4b634b3a4ca8909ce
 lib/codeql/rust/elements/internal/TypeBoundListImpl.qll 23557f993a1de15a3b08652f53fd99dea8b3af4b8a65d7331e99f50735a7942c 8d91dbad037268ec37907ef6c2b0e927f648551afb57f706ed4d79d6aad5f5d6
 lib/codeql/rust/elements/internal/TypeParamConstructor.qll a6e57cccd6b54fa68742d7b8ce70678a79ac133ea8c1bfa89d60b5f74ad07e05 0e5f45d250d736aaf40387be22e55288543bdb55bbb20ecb43f2f056e8be8b09
 lib/codeql/rust/elements/internal/TypeParamImpl.qll 9e7169e8254e2d9d13b11a17cbe04e874f72fb67a75c3585e70eddec71ba5c7f b8c862b2cd53bc211caea23261d9832613418aae51f63ef08922d300c2d1f4f2
-lib/codeql/rust/elements/internal/TypeRefImpl.qll cfc08bdcc8e7e588f533c7e64c0c08d317d63cdb50f4cba4b4b3e589b37b0fea b46ee7de9b5e9894807004e1bedf39e7d25912ed79de6ac5adfb37a43aa4804b
+lib/codeql/rust/elements/internal/TypeReprImpl.qll 504b137313407be57c93fe0acee31716a02f91e23ce417e7c67bae2ae9937564 28fa8b680d5cd782c5c5fb048a9deb9b9debd196e3bc7df1129843e61eb342ea
 lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll 8dc27831adb49c1a47b9f8997d6065e82b4e48e41e3c35bd8d35255cea459905 6c5a5272d37f83f1c1b17475f8adb7d867e95025d201320e20a32dab1f69f7bf
 lib/codeql/rust/elements/internal/UnextractedImpl.qll 5c23df7e448184d76ccab2c22757ace24663b8be2592a3fa2a44bef43159ebd3 77b0c9fe75a307adc08c422cc88423c5349756878793cf9e79c006c83b4c403b
 lib/codeql/rust/elements/internal/UnimplementedConstructor.qll 70b0489fdc75fed389de8203947ed9c8eabb91373a1264eb2c8018ddbb2d9baa 0f2592c1697a2f2f913014ecd73b0e3ff1ec5b038ba1c3a22e7939bf8759e664
@@ -422,32 +422,32 @@ lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 73806a0de8168b38a9436f
 lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll 67a7b0fae04b11cf771727ff39a123fb2d5ce6e2d650d32478fcb33a26ed5688 15833405fa85f6abe0e5146dac283cb5a142a07f08300ccc15a1dae30ed88942
 lib/codeql/rust/elements/internal/generated/ArrayListExpr.qll f325163c2bd401286305330482bee20d060cecd24afa9e49deab7ba7e72ca056 ae3f5b303e31fc6c48b38172304ee8dcf3af2b2ba693767824ea8a944b6be0eb
 lib/codeql/rust/elements/internal/generated/ArrayRepeatExpr.qll ac2035488d5b9328f01ce2dd5bd7598e3af1cbb383ddb48b648e1e8908ea82fc 3ec910b184115fb3750692287e8039560e20bd6a5fb26ac1f9c346424d8eaa48
-lib/codeql/rust/elements/internal/generated/ArrayType.qll 225ac477f67865d72b2a2e17420f5e52c25452a3c14f7ff367f873a859f97783 0030e3bf296dd5b69ea912fc85dc7120b060780033083127257cdca792dc3f4b
+lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll 0945bea9b40ebf871b9d5ac974e256cda985f05113cac63cf8af48da5e4eaace 4d8b67d3ce117f509f984d03ae0c44533d3880d4687c7614fed1e9eac9ce2e6f
 lib/codeql/rust/elements/internal/generated/AsmExpr.qll b5fef59589c02c17857a4a7f5c7b5efb747a1e98710167efa5c2e88cffd7bcbb b43b297a3b4894e8dd92ef3a23b76f2684c303d41e6030398e69b7754ebea9cd
 lib/codeql/rust/elements/internal/generated/AssocItem.qll aa7c06e001b67e4a59476fa7299e09f8da16c93f91aff0ec9812c64386e7c023 0032b45e34e6aba9c4b3d319b108efa0de8ad679b5f254a1ec7c606877ff5e95
 lib/codeql/rust/elements/internal/generated/AssocItemList.qll c53d95395352bb3568198fd18da62e23511c64f19b5aaae4122bd696d402ebf5 3c244f2f0f053903576cdf2b1a15874dee0371caf9fecb5353aceab3c403f532
-lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll 2a5bff8856c2c87f571629236218d23a7eb10fcc8e8e03f4f6957707972a96f8 1ceb581c640a9b0e9540655aebe7280101f33a6a8ff09d81f7d94ebb4d85c480
+lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll 9a1fef9d51764a5647e540eb5c07b00c5e4738cd12efc887f05ac74962a15a25 ac564fbd6be444faa3b675c3ec3f979b6c72ebadcdd98a92febf3d83231d8982
 lib/codeql/rust/elements/internal/generated/AstNode.qll 1cbfae6a732a1de54b56669ee69d875b0e1d15e58d9aa621df9337c59db5619d 37e16a0c70ae69c5dc1b6df241b9acca96a6326d6cca15456699c44a81c93666
 lib/codeql/rust/elements/internal/generated/Attr.qll 2e7983b2c462750065ed58cc10c62e42012ddf0dd32f5439df7c6d6bf8ff349d e8270d33a50f088a83a2dfaa5b0a63ec775a6c97c8bf3a9383ce7a1ba8fe8fa3
 lib/codeql/rust/elements/internal/generated/AwaitExpr.qll 1d71af702a1f397fb231fae3e0642b3deeba0cd5a43c1d8fabdff29cac979340 e0bfa007bdecc5a09a266d449d723ae35f5a24fbdfc11e4e48aeea3ec0c5147c
 lib/codeql/rust/elements/internal/generated/BecomeExpr.qll 7a211b785a4a2f961242d1d73fd031d381aad809f7b600ce7f7f864518bb7242 17a0388680007871748cfdc6621f700a7c2817b9601e1bd817fb48561e7c63ad
 lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 64e9bd9c571edd6e5f3e7662b956b1d87fa0354ce6fe95da9caf25ac16b66c68 3fca09fdbe879db2ca3293618896a462e96376a2963d15cce3d5b1baac552fcb
 lib/codeql/rust/elements/internal/generated/BlockExpr.qll 5a5ddbe34bc478a7bd9b0d07d3b6f017c2d1f20581d859251a963314e6514d1f 9804c30b8b279038b864c52557535f854bd012bacdfe8e5840f1f777c74e52df
-lib/codeql/rust/elements/internal/generated/BoxPat.qll ec946a3e671ab7417e04b0207967adad004df512c570c4f0780ca5816d12d75f b0e64860855c4e85914042b1a51034899ff7cd1b2c6857188de89310a2726ea3
+lib/codeql/rust/elements/internal/generated/BoxPat.qll 597bed52f7489e0addce3266f7bee5be7c53d2d1263eceec3a252d041ca0908f b8ccf363ca5f1a988547caf1fd266a55aec7cbf8623578deea99765d264b0151
 lib/codeql/rust/elements/internal/generated/BreakExpr.qll 0f428a8b2f4209b134c2ffc3e1c93c30bc6b0e9c9172f140cefa88c1f77d8690 957b39f38ff6befe9061f55bc0b403c2f1c366dd0cf63b874bae6f8216576d76
 lib/codeql/rust/elements/internal/generated/CallExpr.qll f1b8dae487077cc9d1dccf8c3cd61fd17afe860585f17ce8b860be4859be7ca4 6034fc03778e38802cdf3a6e460364b74e92912622581b31e6179951022bbbd6
 lib/codeql/rust/elements/internal/generated/CallExprBase.qll cce796e36847249f416629bacf3ea146313084de3374587412e66c10d2917b83 c219aa2174321c161a4a742ca0605521687ca9a5ca32db453a5c62db6f7784cc
 lib/codeql/rust/elements/internal/generated/Callable.qll b0502b5263b7bcd18e740f284f992c0e600e37d68556e3e0ba54a2ac42b94934 bda3e1eea11cacf5a9b932cd72efc2de6105103e8c575880fcd0cd89daadf068
-lib/codeql/rust/elements/internal/generated/CastExpr.qll d6fbf02e9e202254666082a9116634d0eb933177866ac4c0a57b5e9c4bb4b383 477f67773492e3b82695461d56327c9db05a7d1a67e8d192406265f2ce369670
+lib/codeql/rust/elements/internal/generated/CastExpr.qll 427bfd937cd3e737c65aa121aab2a7dc166f82aaacb9a7c41a3d211d4c1dcfb0 642c8c27d4a8752744dadce45814d4e289ce02b67eb2bc2e63ff4c2e5f7825f5
 lib/codeql/rust/elements/internal/generated/ClosureBinder.qll 94c0dcdd4cd87d115659d496c88a98354bc7d4ddc0fa27028003bf7688b99987 d59d713b426dbbdb775df9092d176eea031dac1f14e468810f2fc8591399cd19
-lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 70bb3d961e4dc62ad2c9b80d8cbe1e1d5792eafa00a2b0730c06cf6e8a164105 acb3c5200877fda8dffc65b4aa1d4deeb806e035aefecf4da7f0ce03e0b3a477
+lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 34149bf82f107591e65738221e1407ec1dc9cc0dfb10ae7f761116fda45162de fd2fbc9a87fc0773c940db64013cf784d5e4137515cc1020e2076da329f5a952
 lib/codeql/rust/elements/internal/generated/Comment.qll cd1ef861e3803618f9f78a4ac00516d50ecfecdca1c1d14304dc5327cbe07a3b 8b67345aeb15beb5895212228761ea3496297846c93fd2127b417406ae87c201
-lib/codeql/rust/elements/internal/generated/Const.qll 40464df9d8baacbc85bd137c7d1661684c957c407b2363ea60d90946be93de4c a3316beae55f570a5ca4b1172ef8267d7acb1104cc7a5e9efc58d9fc8224500f
+lib/codeql/rust/elements/internal/generated/Const.qll 03bd9bb84becc0716e12e8a788ab07098e568c58b43b63ed0d333b1c9e227ab7 3168e7b4cb551b9fde74967847576dada05f12a49a1b19c6900e0de32651bcd4
 lib/codeql/rust/elements/internal/generated/ConstArg.qll e2451cac6ee464f5b64883d60d534996fcff061a520517ac792116238a11e185 1dd6d4b073b0970448a52bbe2468cd160dfe108971dbf9ae9305900bd22ef146
-lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll a425a7fd216d35f17a7ff239d431b349721f71f2e52722325755f43df2bb9886 a9aa37ee4f8c9d44ae49c807ac48d5a8a22f7d7d0ae2968ab50371a418ccc48a
-lib/codeql/rust/elements/internal/generated/ConstParam.qll 26f838dbbd7659cdbf464c2107304b66ad0fbd43370d6b649373c3b9fa4f6576 c658951ba92b919278fa445cd66c3b694f42d76bde49daa50a3128e5d44f647a
+lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll 7526d83ee9565d74776f42db58b1a2efff6fb324cfc7137f51f2206fee815d79 0ab3c22908ff790e7092e576a5df3837db33c32a7922a513a0f5e495729c1ac5
+lib/codeql/rust/elements/internal/generated/ConstParam.qll 310342603959a4d521418caec45b585b97e3a5bf79368769c7150f52596a7266 a5dd92f0b24d7dbdaea2daedba3c8d5f700ec7d3ace81ca368600da2ad610082
 lib/codeql/rust/elements/internal/generated/ContinueExpr.qll e2010feb14fb6edeb83a991d9357e50edb770172ddfde2e8670b0d3e68169f28 48d09d661e1443002f6d22b8710e22c9c36d9daa9cde09c6366a61e960d717cb
-lib/codeql/rust/elements/internal/generated/DynTraitType.qll da9dce6347ce385d7468986cf6960b4a6787f017ff5632612a7216ed62bdc9c9 9d0b37221674b597a21bfacbdfc7e08b54381a6adacfe544df154481cd562ed8
+lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll a9d540717af1f00dbea1c683fd6b846cddfb2968c7f3e021863276f123337787 1972efb9bca7aae9a9708ca6dcf398e5e8c6d2416a07d525dba1649b80fbe4d1
 lib/codeql/rust/elements/internal/generated/Element.qll fb483b636180c699181c8aff83bc471b2c416206694f7028c671015918547663 542d1b9ae80c997974c94db3655887186df3921a8fa3f565eaf292dcfdac3c4c
 lib/codeql/rust/elements/internal/generated/Enum.qll 4f4cbc9cd758c20d476bc767b916c62ba434d1750067d0ffb63e0821bb95ec86 3da735d54022add50cec0217bbf8ec4cf29b47f4851ee327628bcdd6454989d0
 lib/codeql/rust/elements/internal/generated/Expr.qll 5fa34f2ed21829a1509417440dae42d416234ff43433002974328e7aabb8f30f 46f3972c7413b7db28a3ea8acb5a50a74b6dd9b658e8725f6953a8829ac912f8
@@ -458,37 +458,37 @@ lib/codeql/rust/elements/internal/generated/ExternItem.qll 749b064ad60f32197d5b8
 lib/codeql/rust/elements/internal/generated/ExternItemList.qll 6bc97fdae6c411cab5c501129c1d6c2321c1011cccb119515d75d07dc55c253b 6b5aa808025c0a4270cac540c07ba6faede1b3c70b8db5fd89ec5d46df9041b2
 lib/codeql/rust/elements/internal/generated/FieldExpr.qll 3e506b5cb93793ec30f56bb637a600db869fcba6181b068516a671d55c362739 7bbf953696d763ad6b210f378f487ba85b875fa115b22c0c0508599a63633502
 lib/codeql/rust/elements/internal/generated/FieldList.qll 43c13c6e3c9ba75a7a4cb870fc4f18752001584d48b9df0734055a6ebb789331 7c51b0b13eb02f1286d3365e53a976ba2655c4dbd8e735bc11c8b205c829e1ee
-lib/codeql/rust/elements/internal/generated/FnPtrType.qll 748d766dbefd19a7d644734c57885eeede66897029bbfe1b87919517f43bfde2 5a7d80acc00e56594ed85026a8ea4923104d2e98c2e42db8c5bcd32ddd164e48
-lib/codeql/rust/elements/internal/generated/ForExpr.qll d81751e9599874a1292a0aace80b2de60ab36fc43f74ec08fbdfe044fc19e5c1 34a64586f8ffbadd44d0e747f69ab550a16149b658a9c92d9593689cb9a4f6fc
-lib/codeql/rust/elements/internal/generated/ForType.qll 3d43d044a1189281f09c55caafb6c8020a836f49e2866077086101925a573cf2 646b59bfd1b428aaf7211f574c49f79cb4c6a79ca151aa0663b2b31480298721
+lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll d490ab9f2e3654d9abde18a06e534abd99ca62f518ca08670b696a97e9d5c592 01500319820f66cb4bbda6fe7c26270f76ea934efff4bb3cbf88e9b1e07e8be2
+lib/codeql/rust/elements/internal/generated/ForExpr.qll 6c1838d952be65acaa9744736e73d9bfdcf58d7b392394223bf6fbfdcc172906 44237a248a5aa326a2544e84bc77f536f118f57a98c51562b71ddc81edfcccb8
+lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll 3027879795a6be5bfb370b8c2231b579f9df8afde54345416c6ce2c64bd3dfec f871d73b36f079f473915db298951020e5a05bb5e8e4d570822063afb4807559
 lib/codeql/rust/elements/internal/generated/Format.qll df7ef61e6ba61fa0eb093f8e6b3e7a0329104e03f659c9507db9535b8b4ea759 ef8ddd98405fc84938ad8cd5f87d2858e01d06a6bb00566a785a984b60a79dc6
 lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll e07a1ae310f590003f1b88fada7dcf4847c99adb9d4c838d1c88e66e1da85c5f 0ef7342451fe2cb06e765fb4b33bb8c4a9b927f5edbc8feb5c6ba3655697f447
 lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 8aed8715a27d3af3de56ded4610c6792a25216b1544eb7e57c8b0b37c14bd9c1 590a2b0063d2ecd00bbbd1ce29603c8fd69972e34e6daddf309c915ce4ec1375
 lib/codeql/rust/elements/internal/generated/FormatArgument.qll cd05153276e63e689c95d5537fbc7d892615f62e110323759ef02e23a7587407 be2a4531b498f01625effa4c631d51ee8857698b00cfb829074120a0f2696d57
 lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll a6175214fad445df9234b3ee9bf5147da75baf82473fb8d384b455e3add0dac1 a928db0ff126b2e54a18f5c488232abd1bd6c5eda24591d3c3bb80c6ee71c770
-lib/codeql/rust/elements/internal/generated/Function.qll f285ee0c771f897eba6db34a7e98f3cfb7db91b0df252ff4b37fc9d779de0bfb 07401e832565ff376acda219514c2e2bbe4ae5058c76a73b40ca6ca66f1626c7
+lib/codeql/rust/elements/internal/generated/Function.qll 6c04fffdc9de54cd01ff76f93aef5fcd3f2f779a2735523c9b1a859d394cefc9 af3c0f05c05ecd74560ab7b128a4a8e9822aa3cb80eddf304d51ea44725ac706
 lib/codeql/rust/elements/internal/generated/GenericArg.qll 464da0ba1c5ddcd1be68617167f177773d99b5ac4775ec8ea24d503e789a9099 6faa1033d59baf7c210ac4837a55781cfc054b7acbad8027faf4630dbfa6e101
 lib/codeql/rust/elements/internal/generated/GenericArgList.qll b8cd936bba6f28344e28c98acf38acb8ef43af6ecf8367d79ed487e5b9da17cb 8b14331261e49d004807285b02fca190aafd62bfb9378b05c7d9c1e95525fe7b
 lib/codeql/rust/elements/internal/generated/GenericParam.qll a0285123f974f287154b706bf6688b86edf72a4adcec57346c654d962435651b b42c3915e9564b5b5c5282229bf882aa3309de26a77721b2255d6f4235c0cc38
 lib/codeql/rust/elements/internal/generated/GenericParamList.qll f2d8945bc70cda6929bb6b652f9e3c7707e73fb5e778b21e99dbac594e71285f 7b97da5b6a6504377456bedebddc293d714f90e8fc2ce64199656666d5f749af
-lib/codeql/rust/elements/internal/generated/IdentPat.qll a1269182132b2f52c5d842e58cbfa1cee49b143fa3766ed9fcf65389bf5137eb 46009fa66065222d865fa4714dd16c0373ffb16d576da45e7bf3a06432bd3a23
+lib/codeql/rust/elements/internal/generated/IdentPat.qll 1fe5061759848fdc9588b27606efb1187ce9c13d12ad0a2a19666d250dd62db3 87dbc8b88c31079076a896b48e0c483a600d7d11c1c4bf266581bdfc9c93ae98
 lib/codeql/rust/elements/internal/generated/IfExpr.qll 413dd7a20c6b98c0d2ad2e5b50981c14bf96c1a719ace3e341d78926219a5af7 c9a2d44e3baa6a265a29a683ca3c1683352457987c92f599c5771b4f3b4bafff
-lib/codeql/rust/elements/internal/generated/Impl.qll e33ef5d3e49e64beca0ca9d5c0ba972d99007e5011eeedc11e67d3fbb569ab4a 5c5d88110864f4fd3d966b1ad973eaabd7a9c5a07adc18bff01dc09395214825
-lib/codeql/rust/elements/internal/generated/ImplTraitType.qll 3c29684f5ef386b883b79dc9758441d97f090e065be177ffc8240aaf0f3d1e7b 03ea42c2a95cf917ec73d88b7b4ca5e53e10d7b046074f59100c0ec6c2c1ed6d
+lib/codeql/rust/elements/internal/generated/Impl.qll 863281820a933a86e6890e31a250f6a8d82ffc96c8b0fa9ff3884548f89d57b5 85fdb5c18db98dd15b74fed5a7547cb6e4db58ab2b9573d0a5cf15a9a2033653
+lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll a1bbebe97a0421f02d2f2ee6c67c7d9107f897b9ba535ec2652bbd27c35d61df ba1f404a5d39cf560e322294194285302fe84074b173e049333fb7f4e5c8b278
 lib/codeql/rust/elements/internal/generated/IndexExpr.qll cf951fc40f6690e966b4dc78fa9a6221aa5c6cade44759dcb52254f799292d11 1572e71918cc4e0b7e028331b6d98c9db23100a3646cd3874d1915e06ab6211d
-lib/codeql/rust/elements/internal/generated/InferType.qll 23ee25135c59ea5578cdf7c34a41f606e217e7260c3c8f404d12836585d5cad4 400da322fa1be62c4e300ebdf481eb92d4226eb6c316c668da8cc5168065774f
+lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll dab311562be68a2fcbbe29956b0c3fc66d58348658b734e59f7d080c820093ae ca099ecf9803d3c03b183e4ba19f998e24c881c86027b25037914884ce3de20e
 lib/codeql/rust/elements/internal/generated/Item.qll 97f204f27c12689a01fef502a4eec3b587e4eaccd278ec07a34c70a33ce6119d 139af2d44f794d0f91d9aabc3d50d895107c34bd9bcb72457a2e243c14622e51
 lib/codeql/rust/elements/internal/generated/ItemList.qll 73c8398a96d4caa47a2dc114d76c657bd3fcc59e4c63cb397ffac4a85b8cf8ab 540a13ca68d414e3727c3d53c6b1cc97687994d572bc74b3df99ecc8b7d8e791
 lib/codeql/rust/elements/internal/generated/Label.qll 6630fe16e9d2de6c759ff2684f5b9950bc8566a1525c835c131ebb26f3eea63e 671143775e811fd88ec90961837a6c0ee4db96e54f42efd80c5ae2571661f108
 lib/codeql/rust/elements/internal/generated/LabelableExpr.qll 896fd165b438b60d7169e8f30fa2a94946490c4d284e1bbadfec4253b909ee6c 5c6b029ea0b22cf096df2b15fe6f9384ad3e65b50b253cae7f19a2e5ffb04a58
 lib/codeql/rust/elements/internal/generated/LetElse.qll 7ca556118b5446bfc85abba8f0edd4970e029b30d414ea824a1b5f568310a76c a403540881336f9d0269cbcdb4b87107a17ab234a985247dc52a380f150a1641
-lib/codeql/rust/elements/internal/generated/LetExpr.qll 6f831be1d0f76258d5f74c847636e070a819dee5aa090be0c52a971f261eaff3 e85a48e7492862f738e184f5f1512c2d18d33a0cfb516e269334acf7448b508a
-lib/codeql/rust/elements/internal/generated/LetStmt.qll aa1852db86ec29f857a90677f0c6b4a07f0fd965fc193d4141be95ce15862fca 40f32a37c0cc161b099fe0b4c7d713da928781d3e2c3de90db991df1d9062647
+lib/codeql/rust/elements/internal/generated/LetExpr.qll 5983b8e1a528c9ad57932a54eb832d5bcf6307b15e1d423ffa2402e8a5d8afa4 8a6affdc42de32aa1bfc93002352227fc251540304765e53967bab6e4383f4ae
+lib/codeql/rust/elements/internal/generated/LetStmt.qll 21e0fadccc1e7523ef1c638fc3e2af47256791eff70d1be01a9c377659ee36ef 21ccb4821bdbde409f17ae96790e395546d6c20d2411fccf88bad6ef623a473e
 lib/codeql/rust/elements/internal/generated/Lifetime.qll 90d01c76188ce0c053122c62b41e47f27c4c7717ca5a4999a76797360043da0d 7b9feb202da5a06cd17f7770bb66742fd9e7cff0d410fefc7ffaafe710ac16d6
 lib/codeql/rust/elements/internal/generated/LifetimeArg.qll 7c1a44e3d480e75142b171eb51382c9492d393043833c0ab4a4036eba19043b8 7d8273b62794268dab6938ba1e3a3560a80a2c49cd9a9717345785dacd311059
 lib/codeql/rust/elements/internal/generated/LifetimeParam.qll bcbde38bfb99034e470634dbd32c0df34c40e1e531e2d235b7ef29c0b66f8a56 1fd15bbaa1dbc521b2ee4bf0bc1009c411aff15eac07c0842ed9883d9a291669
 lib/codeql/rust/elements/internal/generated/LiteralExpr.qll f3a564d0a3ed0d915f5ab48e12246777e4972ad987cd9deaafeb94cf407b2877 2337c3d5f60361bd10f6aeca301e88255f5dffb85301cf36cbbfa1a65bfad1cd
-lib/codeql/rust/elements/internal/generated/LiteralPat.qll ecc2bfe559abfce1be873fbf7b61b5728897c9afc3bb3f69551d8320d273da71 42196fb6a4a0ff9b570fd0bdbc920f24744b3f46772efbb46648af7fbfe1fbda
+lib/codeql/rust/elements/internal/generated/LiteralPat.qll f36b09cf39330019c111eeaf7255ce3240178342d0ddaace59dbfee760aa4dbb d58667cf4aa0952450957f340696cb2fd22587206986c209234162c72bdb9d9a
 lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a4a93332ca3d8f421bae02493ea2a0555023071775e b32d242f8c9480dc9b53c1e13a5cb8dcfce575b0373991c082c1db460a3e37b8
 lib/codeql/rust/elements/internal/generated/LoopExpr.qll db6bc87e795c9852426ec661fa2c2c54106805897408b43a67f5b82fb4657afd 1492866ccf8213469be85bbdbcae0142f4e2a39df305d4c0d664229ecd1ebdb9
 lib/codeql/rust/elements/internal/generated/LoopingExpr.qll 0792c38d84b8c68114da2bbdfef32ef803b696cb0fd06e10e101756d5c46976c 111fe961fad512722006323c3f2a075fddf59bd3eb5c7afc349835fcec8eb102
@@ -496,11 +496,11 @@ lib/codeql/rust/elements/internal/generated/MacroCall.qll fc8988696493992cc4fdce
 lib/codeql/rust/elements/internal/generated/MacroDef.qll e9b3f07ba41aa12a8e0bd6ec1437b26a6c363065ce134b6d059478e96c2273a6 87470dea99da1a6afb3a19565291f9382e851ba864b50a995ac6f29589efbd70
 lib/codeql/rust/elements/internal/generated/MacroExpr.qll 03a1daa41866f51e479ac20f51f8406d04e9946b24f3875e3cf75a6b172c3d35 1ae8ca0ee96bd2be32575d87c07cc999a6ff7770151b66c0e3406f9454153786
 lib/codeql/rust/elements/internal/generated/MacroItems.qll 894890f61e118b3727d03ca813ae7220a15e45195f2d1d059cb1bba6802128c8 db3854b347f8782a3ec9f9a1439da822727b66f0bd33727383184ab65dbf29ac
-lib/codeql/rust/elements/internal/generated/MacroPat.qll 9e927e09d47029a3025eaad271c975e73479a80ea933c921381b6c9d751f2866 bdf5c58ca27743eb2e2dae2aeea3f3fc21f8a4f98fe1001598876455c88e8f69
+lib/codeql/rust/elements/internal/generated/MacroPat.qll 26bc55459a66359ad83ed7b25284a25cdbd48a868fd1bbf7e23e18b449395c43 f16ede334becba951873e585c52a3a9873c9251e3dab9a3c1a1681f632f2079f
 lib/codeql/rust/elements/internal/generated/MacroRules.qll 4fbd94f22b5ee0f3e5aaae39c2b9a5e9b7bf878a1017811ca589942f6de92843 49fb69543ee867bae196febea6918e621f335afdf4d3ccbf219965b37c7537b1
 lib/codeql/rust/elements/internal/generated/MacroStmts.qll cb4f3c2721a4d0c8522e51f567c675f4fc95f39bac8a2bd97e125d5553515ad2 09b5a739ccee75e6c556b34ecd6f78c7dc799029d9bc7df2e6169098d24f0ccd
-lib/codeql/rust/elements/internal/generated/MacroType.qll c462824df4a002956c036966d15cd0bce206e664888f8d0c7834dedb38b3c0bf 947480f07c40128ef3d00ad4c3a29a685472b3e20a661680c22f6bb318205ed1
-lib/codeql/rust/elements/internal/generated/MatchArm.qll 8fb740a0f2e308782d9cf390672969cd7cf6e698e5b847fb02ae3fa6c205646f 42bfe8dd94fc24ec925fbd44016df111600f99d1216c9a698631373bb6048830
+lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll 4242e253fa36ee3f7d9d0677811ff5bc4ecfb02c76d768446a6a6dcd38061f68 a676632f3bb83142a0838601ae2a582d5c32d7939e4261eb8fccf3962bb06cb2
+lib/codeql/rust/elements/internal/generated/MatchArm.qll f8c4c955c50f8398159c492d9d0a74f7b71e9510fcb8a3aab1d06e0f7e15b263 713939c7ef77ca73d95788096163c26213ab49f34ed41c6f4bc09a1ef9607b0d
 lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef4653562cc10a4429078316b5ec7c47b076336cf4aca2e 41c674293c13eceaca62134ae0c6778541f6a5201cbc5c146f0ba01b898dc267
 lib/codeql/rust/elements/internal/generated/MatchExpr.qll b686842e7000fd61e3a0598bf245fb4e18167b99eca9162fdfdff0b0963def22 00f1743b1b0f1a92c5a687f5260fda02d80cc5871694cad0d5e7d94bac7fe977
 lib/codeql/rust/elements/internal/generated/MatchGuard.qll 521a507883963106780f1782084c581fbcf1179863c7c15438c4db79e30e78dd 6226feffaaa8d828a42ece0c693e616cd375672eb987c3b7ff1ca15fa23c116a
@@ -510,73 +510,73 @@ lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae2
 lib/codeql/rust/elements/internal/generated/Module.qll ebae5d8963c9fd569c0fbad1d7770abd3fd2479437f236cbce0505ba9f9af52c fa3c382115fed18a26f1a755d8749a201b9489f82c09448a88fb8e9e1435fe5f
 lib/codeql/rust/elements/internal/generated/Name.qll 12aad57744b7d1b04454159536409244c47319aedd580acb58ee93ef9d7f837d 63fc67ccc085db22f82576a53489f15216a7c29d5b941b14a965eab481534e2e
 lib/codeql/rust/elements/internal/generated/NameRef.qll 4292fc7aa9ba22a7fa5bd638c38f696cc6724d8ed5e7346e7c5a52c4e4b65eec dfa8c3d4b521e43b76b18666d3d32d159c21b7b194285bac425df681544d269f
-lib/codeql/rust/elements/internal/generated/NeverType.qll 14dd3c08db1db873b365fc7f0d1cf3f5d6229b1f78bc85100c36c22d1bb8ee40 34257df0ac59cfd982ea5f30ab225c8bfece71d9fd3be84ff79cf1b0bff55060
-lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll bb17a1e1d4332225cf4bbbae4a1bab9302c2d81d191fe835f2f973915d40dd2a f9e73210b81992040a5a5a9ac3ad936159fb3475445f130c7b28f83dfb4170f5
-lib/codeql/rust/elements/internal/generated/OrPat.qll ee0487b90849c3e2a836c956ae8837f27515a9dc795bf17287cba2cf7a39d839 35117b6a3dcebab09f12665441332b6863200e206679ee97894170dd9ef7795c
-lib/codeql/rust/elements/internal/generated/Param.qll 4f853cece9ca8d41ef41ff7656a7f291568f1218403bebcd8afbf07e93fab6bf 93a1372f1d129b83470aa0dc481f46649771d1f5b72b114f215a51514ddd641a
-lib/codeql/rust/elements/internal/generated/ParamBase.qll 9d9a82643019d2a13f28555dbdd60221cf6dc2e890f6541e7f85a91646585f2c 0e4a3e4c0e069a43d449167cb706c6f5d0d097b4cab2a7ade84c2c1b5528eca7
+lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll c601b228a6359f809425ad43b46c1c444c9826652b07f8facc6f9729df268285 23b53bb1d826a8b54b68bd4f138ebaabeeb2f56392c882b32417eff388aa80cc
+lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll c86eecd11345a807571542e220ced8ccc8bb78f81de61fff6fc6b23ff379cd12 76a692d3ad5e26751e574c7d9b13cf698d471e1783f53a312e808c0b21a110ab
+lib/codeql/rust/elements/internal/generated/OrPat.qll 0dc6bd6ada8d11b7f708f71c8208fc2c28629e9c265c3df3c2dc9bea30de5afa 892119fc1de2e3315489203c56ee3ed3df8b9806e927ee58aa6083e5b2156dab
+lib/codeql/rust/elements/internal/generated/Param.qll 19f03396897c1b7b494df2d0e9677c1a2fc6d4ae190e64e5be51145aba9de2e2 3d63116e70457226ea7488a9f6ed9c7cea3233b0e5cab443db9566c17b125e80
+lib/codeql/rust/elements/internal/generated/ParamBase.qll 218f3b821675c0851b93dd78946e6e1189a41995dc84d1f5c4ac7f82609740f7 4c281b4f5364dab23d176859e6b2196a4228a65549e9f63287fa832bd209e13d
 lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b63a2ca5296b5506bffdeea054893a56cde08f91560 d4599c52231f93e1260fbae7de8891fe4287fa68b1423592b7a1d51c80146dc8
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
-lib/codeql/rust/elements/internal/generated/ParenPat.qll ce24b8f8ecbf0f204af200317405724063887257460c80cf250c39b2fdf37185 e7c87d37e1a0ca7ea03840017e1aa9ddb7f927f1f3b6396c0305b46aeee33db6
-lib/codeql/rust/elements/internal/generated/ParenType.qll 9cc954d73f8330dcac7b475f97748b63af5c8766dee9d2f2872c0a7e4c903537 c07534c8a9c683c4a9b11d490095647e420de0a0bfc23273eaf6f31b00244273
-lib/codeql/rust/elements/internal/generated/ParentChild.qll 8bec00eb2527dad0c361736d318745169296e4e949fc4263790d25c3286b2f79 91b5bd23de043906d91b3d7b75cd75b9cdc77e037a2be2af75912bc285068cbc
+lib/codeql/rust/elements/internal/generated/ParenPat.qll 4f168ef5d5bb87a903251cc31b2e44a759b099ec69c90af31783fbb15778c940 0e34f94a45a13396fd57d94c245dc64d1adde2ab0e22b56946f7e94c04e297fc
+lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 40ab5c592e7699c621787793743e33988de71ff42ca27599f5ab3ddb70e3f7d8 12c0a6eed2202ee3e892f61da3b3ce77ac3190854cdf3097e8d2be98aa3cb91d
+lib/codeql/rust/elements/internal/generated/ParentChild.qll c3f6352ef56aabb6bc784deafc35807b32df6f41c3bca3437221166776885c2d 3f04580798ab351e5835957379ced2b45fec628b76578c0f33f571cf03abfc83
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 4c1c8e840ed57880e574142b081b11d7a7428a009f10e3aa8f4645e211f6b2e0 989668cf0f1bdee7557e2f97c01e41d2a56848227fed41477833f5fc1e1d35f6
-lib/codeql/rust/elements/internal/generated/PathExpr.qll 2096e3c1db22ee488a761690adabfc9cfdea501c99f7c5d96c0019cb113fc506 54245ce0449c4e263173213df01e079d5168a758503a5dbd61b25ad35a311140
+lib/codeql/rust/elements/internal/generated/PathExpr.qll 4ff4b2ab77bce1dbfddb315e7d1ff13d6fcd6bb7c30c105402f8082d05f1d337 fbc4f4e05da75ab543af33cfb620cfe09239e2574b8312f2c5bedca8a65ea6e8
 lib/codeql/rust/elements/internal/generated/PathExprBase.qll d8218e201b8557fa6d9ca2c30b764e5ad9a04a2e4fb695cc7219bbd7636a6ac2 4ef178426d7095a156f4f8c459b4d16f63abc64336cb50a6cf883a5f7ee09113
-lib/codeql/rust/elements/internal/generated/PathPat.qll 98c9938d6a359fd717829b196eb09701d2c798e18c1f43fa7b2a9145afdf6c19 caba2e629cae08682baac90a76ae9a48cda2d7d6f9c23d506fa0ff3f292978a4
-lib/codeql/rust/elements/internal/generated/PathSegment.qll 0fa07886deb0fc4d909d7edf691238a344f2739900aafb168cbac171eb1729a8 8f4bb418d8bea5e40128a87977c57d0a9183d06d111601ad93130c8615c11465
-lib/codeql/rust/elements/internal/generated/PathType.qll df6fd322ba0d99d6cb315edce8dbf099b661b84fdfcc3ad629fdd1fd066c1986 e11c8615cd7b02034b47b58f30a7b6fcbc6d33ec53303288dfd34d9a25f5a186
+lib/codeql/rust/elements/internal/generated/PathPat.qll 4ef7e7e81257956f9ac947dad8801fb4e0daf039b495ab5ae54c72d51416732c ca0e6e58153d3aa319d5a01858bc5518a0eda2a20adeba9430bd0b91b2bc9c37
+lib/codeql/rust/elements/internal/generated/PathSegment.qll f6892724c0b516f7e04eee3878c8060c5a4c54fe2a3a3836470c86df5fddb28c bdb6b89cf037e09b395729b25117dabc86ebc8b967e39856b5e2a1f3810bb86c
+lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll b847fabe7059485c5194cbc144f38dae2433057771ff10fe0b6ae9876b33afd4 ee2fdcd86d78c389a2276ebe7e889f042b7bb39c3c611f56b951591600a60e8a
 lib/codeql/rust/elements/internal/generated/PrefixExpr.qll c9ede5f2deb7b41bc8240969e8554f645057018fe96e7e9ad9c2924c8b14722b 5ae2e3c3dc8fa73e7026ef6534185afa6b0b5051804435d8b741dd3640c864e1
-lib/codeql/rust/elements/internal/generated/PtrType.qll 40099c5a4041314b66932dfd777c9e2bef90a0711fb8d7c2c2cec764c003ac4a cf8297d93557356a572223d3e8acca701837c4b1f54e8d4351ba195fb7ed27f8
+lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 51d1e9e683fc79dddbffadee9015b5351bf03ce48f879da98b1f6931a61166f8 122a9c4887aa24e3f3a587b2f37c4db32633f56df3c8b696db4b8a609d9d4a98
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
-lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b
-lib/codeql/rust/elements/internal/generated/Raw.qll bb1c4724c3d702a189b41c2d56fa0ce89b957d99daece3229443625f20f7a427 6ace458b3b15e2dc887d11d9b18aebfd27201730ee763076cfe9ec3434a46c12
+lib/codeql/rust/elements/internal/generated/RangePat.qll 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9
+lib/codeql/rust/elements/internal/generated/Raw.qll f52ff91f985848ca0e251efee1e246ae80fdca13f530df301f7090a5b18bcf13 136a84549b183d222fb6063d34d4b714b7dd42f6eb3f756894285bf405c24a22
 lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40
 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
-lib/codeql/rust/elements/internal/generated/RecordField.qll 9f7840e1a2a194d5ed1d5201ab483eb01129849d49392581e0328bbc0934305c 0e019b5b8fe91bc96c7c07933c766d8a09c066d48ed96f24ae3dad303c00585e
+lib/codeql/rust/elements/internal/generated/RecordField.qll 6d4b184c85419f9282937ebd1b1d14930a263e8754124f2323953991ca0f0e59 2f8bec227f960ae98fc320a65efdfdc5dc04455cd59697e2621585e5a5f942b8
 lib/codeql/rust/elements/internal/generated/RecordFieldList.qll d7bb2677338cf420b0d6371aeec781aacc2272c73413ea96b7418177ad149fb9 5ef52074b9f4ec31e7422b70efdb2e650d673b2625efdfec18a4e48c30e35cf6
-lib/codeql/rust/elements/internal/generated/RecordPat.qll f5f9904fcd8b8fa5fe65b46a68f830021a5e4a68f95ff403151565c3ec770477 56294ed2ff753d8be7742a501b15b5f3f5f20afe0f8171ee6771d049f26489e4
-lib/codeql/rust/elements/internal/generated/RecordPatField.qll f17b1aa265091fd8309fd90d5c3822d170870e304f160225327de5a844a9aed4 0458e39dbe88060b4b664692cf0b41ebf4364de268d9417658c14c883c9c1b33
-lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll 08d4740bbb519f15ab20b694b3c45e396a2a59cce0f68fa4b9698348784cae43 99919809607ae61c707f591ee609c50bcfb90d5b4f9c263f6b8e78658d21b605
+lib/codeql/rust/elements/internal/generated/RecordPat.qll 6a440e2c31ff8ccccc9cc03e3464e3916db637559c43cbbf7915ced5d31ceb5b eb46cf20cfe8d612d2222bea8535922a458ebe1f9e10db1a5afd6954a420a1f6
+lib/codeql/rust/elements/internal/generated/RecordPatField.qll 5bf624d22903fb874e6d03541cf453493badd382b6910ce950ad0d34dd580e9a b9ec89b69a58b9c418405efa9b0e6ee7b07616f5696a0858583a339d657b5855
+lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll a6db0cdcc3da667c52862ed940597d899383ccf2bda9bb3f62b8ce9f48119307 99fe972c80db8f28e2a6f56cf2a11c98183244229da117320cc86c7ade62bd0b
 lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
-lib/codeql/rust/elements/internal/generated/RefPat.qll 5c4d908f851d89f42cf765007c46ac4199200f9b997f368d5b0e2a435efa82cd 42fd637bc98b5a9275386f1c5fb3ae8c4681987289a89b060991416a25131306
-lib/codeql/rust/elements/internal/generated/RefType.qll 3603a3e000acc25c5e675bd4bc4a5551b8f63851591e1e9247709e48d1769dc5 91bea4a1d5ef0779d575567253cd007157d3982524e63a7c49c5cae85cb42e5f
+lib/codeql/rust/elements/internal/generated/RefPat.qll 456ede39837463ee22a630ec7ab6c8630d3664a8ea206fcc6e4f199e92fa564c 5622062765f32930465ba6b170e986706f159f6070f48adee3c20e24e8df4e05
+lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll 3d8c0bd296d33b91a81633f697a43269a6538df06d277262d3990d3f6880ef57 13680f39e89bcd8299c218aba396f3deec804597e6f7cb7d4a7e7c748b6faa77
 lib/codeql/rust/elements/internal/generated/Rename.qll d23f999dab4863f9412e142756f956d79867a3579bd077c56993bdde0a5ac2f1 9256c487d3614bf3d22faa294314f490cf312ab526b8de0882e3a4a371434931
 lib/codeql/rust/elements/internal/generated/Resolvable.qll c038fa24b121ee3e7f6060bce639e7483ea1a14bb552e459b6c67663732dfd6c 4025f2ef318793913e6cfc5d8984e538f402bc062865dcb5496563bec64a2ea9
-lib/codeql/rust/elements/internal/generated/RestPat.qll b3a4206e68cf67a0310a466721e7c4b3ab855e65490d589d3d856ad333b3d5e8 30b471bec377784f61d73ef93e74fc0dcec7f512ac4b8791d1ca65f2bcea14b8
-lib/codeql/rust/elements/internal/generated/RetType.qll a26860cd526b339b9527c089d126c5486e678dd080e88c60ea2fe641e7d661fd a83c1ce32fd043945ad455b892a60c2a9b6a62d7a5aadf121c4b4056d1dfb094
+lib/codeql/rust/elements/internal/generated/RestPat.qll 234bbaa8aa37962c9138baf5b1f4406c3d78f4131b4b8dbb30fc1343d15873d5 653ee6bea4d3cf9454b2834bc4233a8f275295f19635c37a0bca69a587e1eb20
+lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll 173fd722308161f9405f929a13718134f8eaefe9fce1686048860b7c8f4c29f7 30bbaada842369dac5618ae573999f59979597c6a3315c6cce04e5bed0b38c87
 lib/codeql/rust/elements/internal/generated/ReturnExpr.qll c9c05400d326cd8e0da11c3bfa524daa08b2579ecaee80e468076e5dd7911d56 e7694926727220f46a7617b6ca336767450e359c6fa3782e82b1e21d85d37268
 lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll 34e32623d2c0e848c57ce1892c16f4bc81ccca7df22dc21dad5eb48969224465 ccb07c205468bce06392ff4a150136c0d8ebacfb15d1d96dd599ab020b353f47
 lib/codeql/rust/elements/internal/generated/SelfParam.qll e1d994dea58a406dbfca3ea0c724ac48be66ac4380e7270e4037ca2714eef722 90f8ebfac723eef259e13d3c8a7ef6b886c2831d4f436a742144b96db6b6fc92
-lib/codeql/rust/elements/internal/generated/SlicePat.qll 8b1463758d7b15a0303384c8136a48a8e71ce27da4ba6e421272b9751a988e64 7562d47308f197bc63ade0f114cd23a17e7f60fa696716f6a30fc7b7411642fe
-lib/codeql/rust/elements/internal/generated/SliceType.qll 98ee8b566be28f392ab9c9507600e8461ad0b48cbbbd422d22548aca691f8330 528d6eabddf49b9dc474971a2f3a6ddb6f2d77dc7f8449140ef54646c1ceb822
+lib/codeql/rust/elements/internal/generated/SlicePat.qll 722b1bd47a980ac9c91d018133b251c65ee817682e06708ad130031fbd01379b 7e0ce13b9de2040d2ef9d0948aab3f39e5fdc28d38c40bfbee590e2125dbe41c
+lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll efd28e97936944ce56ab5f83aa16cf76cc1b42a39c123959d3a878ca13ceb84e 3435ea66d467f4234b9644ce63fa9072a7e9ac86e23d464ba18aea7802fc03a7
 lib/codeql/rust/elements/internal/generated/SourceFile.qll 55d44c9f09c5ff28c4f715f779a0db74083e1180acaf0d410e63ca07b90d1cb5 78c0af48b0b64aa377413ea4799dfe977602a111208e1d25e4bdfa920dbd7238
-lib/codeql/rust/elements/internal/generated/Static.qll 5fbd6879858cf356d4bdaa6da475de729c12d44ee99aef12bdefe657fdb885e0 0c8e9ef7a93c59b9346265338e38ae3f2e1265981f2d81aab49bc36cf0589382
+lib/codeql/rust/elements/internal/generated/Static.qll ea22838e0b7d9796dfaf5deda5b42f0187cc4fd30791a9dbe378b364d9485978 2496a208a702295984f3a29a9c3c3c19d5b1a6b16267e3dd4e6f3c5930e5faa2
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll a667193e32341e17400867c6e359878c4e645ef9f5f4d97676afc0283a33a026 a320ed678ee359302e2fc1b70a9476705cd616fcfa44a499d32f0c7715627f73
 lib/codeql/rust/elements/internal/generated/Struct.qll 4d57f0db12dc7ad3e31e750a24172ef1505406b4dab16386af0674bd18bf8f4b 1a73c83df926b996f629316f74c61ea775be04532ab61b56af904223354f033e
-lib/codeql/rust/elements/internal/generated/Synth.qll d5358d9ac151c7e5940dbc3c2e3ddbabbb3160d9ea9ba8e8879d7e0b459bf871 1365f2db99d8aae7188197f840efc7c457f63b1ed8b1366974104d8470295069
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 410b2360c1469a655e1a8c7586add83477d129fcb53f61d438502bf43dfb4af2 410b2360c1469a655e1a8c7586add83477d129fcb53f61d438502bf43dfb4af2
+lib/codeql/rust/elements/internal/generated/Synth.qll 0bb53e7d628fcd74a28fb7b00c51dc7f212a775894a4dc485a68089a7c02d766 6c031f7c95974521f17d6fedd429d35a1aea142b7cef5123f34504a79c21670b
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 8f7f08d1599e2dcbe553a7e4428a8787cef76b1d12b88f1b5925a4c59d617fae 8f7f08d1599e2dcbe553a7e4428a8787cef76b1d12b88f1b5925a4c59d617fae
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 8577c2b097c1be2f0f7daa5acfcf146f78674a424d99563e08a84dd3e6d91b46 d2f30764e84dbfc0a6a5d3d8a5f935cd432413688cb32da9c94e420fbc10665c
 lib/codeql/rust/elements/internal/generated/Trait.qll 8fa41b50fa0f68333534f2b66bb4ec8e103ff09ac8fa5c2cc64bc04beafec205 ce1c9aa6d0e2f05d28aab8e1165c3b9fb8e24681ade0cf6a9df2e8617abeae7e
 lib/codeql/rust/elements/internal/generated/TraitAlias.qll 0a3b568100baaca129a12140b0742a1c8e507ef5b2f2c191ff7452c882ba4064 c32e74569f885c683f8d3977682fcbc8b7699b00d5e538cc6b08acdfffa56bc8
 lib/codeql/rust/elements/internal/generated/TryExpr.qll 75bf9fdda5238155d2268806d415e341fa57f293dcadef003b4a11562c4cd877 935c746f822cf183cdf36bef2332f01e7ce38aa09aa8476d64c1062c5e8f13dd
 lib/codeql/rust/elements/internal/generated/TupleExpr.qll 75186da7c077287b9a86fc9194221ab565d458c08a5f80b763e73be5b646b29f 0250d75c43e2e6f56cdc8a0c00cc42b3d459ea8d48172d236c8cdf0fe96dfed2
-lib/codeql/rust/elements/internal/generated/TupleField.qll d2580e046a576a1a7669463956c929912e383de304854a86eea5e45807a0a882 b41cbc48fcbb56543705e6bf708b72156307c71735d2ed42b97d8bf3c1099dd1
+lib/codeql/rust/elements/internal/generated/TupleField.qll b092db3eb240c9e15bcc27aa64bee80b48dced34398e7220d41bcd1a6676b1f7 4e152fb623e4cc8da57733c7c85c11dcb082fe395b337f92cc8b55da1af4c682
 lib/codeql/rust/elements/internal/generated/TupleFieldList.qll 9d4981d04c2ee005e41035b9699f03bff270c4e0515af5482d02e614a0b1a875 4e60b857fbcb668fa1a001e0eff03f1aa3a7465d32ce68e23544b705fa54fc5d
-lib/codeql/rust/elements/internal/generated/TuplePat.qll d61163a380f3f2c1709080e2df69a90764509af060e607e27e832862e4dae18c 108b7db493a21fe1fa0db99fceee952aabb0a128eac41e050877ab9136407403
-lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 87e0acfeb51d48c55648d5af783f5ea006aaeccce990ba26458c6935fbdf7c11 7c761e66ddacb51307e653c6ad45bec3fba8315049fbe6c4503ed19241204d41
-lib/codeql/rust/elements/internal/generated/TupleType.qll 7fae8e881157a24c4ce4f960269ba8010e227a81d3055b571f861f7196f868e2 18085a19a102df8e2cded938b49709225e89f0ce68b4a003310647bb259a6bd3
-lib/codeql/rust/elements/internal/generated/TypeAlias.qll af02bb172b6f2d7f5eab8645a5a219eee8a4bbc445838f5739f18ba217c7e608 6d871471d673adae99c8b146f6f7ab204f24d52b5013b4582037a42b279c9f05
-lib/codeql/rust/elements/internal/generated/TypeArg.qll fe4441b3faa44e542c43a85353347df23d3f74da0c4b17cb0fdc60f5aca9dee7 1473d044e979e7cb6628525ffd454549cd8a37560488c695f534243946cf83bc
-lib/codeql/rust/elements/internal/generated/TypeBound.qll c4e5a5a919a30f4b334e8218b69fae887bf43e3b87bc63863b2c891beba14ba0 c9d394f31a7cbcfae95d511ad030ed515f51e87697233643b9ac12d6ac61ab18
+lib/codeql/rust/elements/internal/generated/TuplePat.qll 4e13b509e1c9dd1581a9dc50d38e0a6e36abc1254ea9c732b5b3e6503335afeb 298028df9eb84e106e625ed09d6b20038ad47bfc2faf634a0ffea50b17b5805d
+lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 646847d866d6b999b084837f2569035c471c777fc4b1f483ce70d5d3fc5dc5ea 2cd1a4020876485635ae28e3d81eca0e596d77123d8ed40a2b18043adc6c69e7
+lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll dc494a783c495c96f2498230d160b59117cfa96d927861cd9d76676fefac8fb2 47da01697f143d4077978594b0c2f4c4bc5e92823dfcaad3ce8ab91725a536a3
+lib/codeql/rust/elements/internal/generated/TypeAlias.qll 56162d01356f018a3acf20b79dcc49a939ebf4f422939fae6a20b91cbbda8564 903b61117f4caa362a350a9cbec701aa59eb2052aff848999ebfaaf574e02352
+lib/codeql/rust/elements/internal/generated/TypeArg.qll e76ea103f7e9ead3be2c34718270d6893ca1980ee31e32ec19a92381e0040d73 9f2ea2d9434d57d7e3223e5d9d7662047e38bda26112751e122e2c1d03549eb5
+lib/codeql/rust/elements/internal/generated/TypeBound.qll 9d956fa99bb8153f575dd2959da021bc1a9207a78910a648f4429ab45f58175e ccf59e2bf4bea133335ae57acefe03d5650dcdef19960eeb00a9e3e4e3a3ef30
 lib/codeql/rust/elements/internal/generated/TypeBoundList.qll 31881cae2f71df5adf7a427357565bc0e7ba58c6a774a9d5835560a34c4db30f 1ff36ba34dd966d945d743781e3a1cccad4bb9fd5d32902dfd0bcad537501a85
-lib/codeql/rust/elements/internal/generated/TypeParam.qll dd57c5c370b4e3ed87c42c4fccf71b554cf1c588de1a1d1ac4ed5edbc1fb4664 09cd09537c1196f0a84850f654d324c6ad8aeaf9debcc3d9879e23a313ed93d9
-lib/codeql/rust/elements/internal/generated/TypeRef.qll c4c3bdafe3deb05338f5031c798fa6e72b58301ee7737a785314e72c9c4f091c e6ec0c680bcfe61ff79468de485241a75fbd795b2d501004324b66b003fddbce
+lib/codeql/rust/elements/internal/generated/TypeParam.qll e0c6b029113c6ba99513ef903bbb1e8f09741d1a1c45dc31d07bb91edcf05657 a31402aa6128b1e7da79148e59ce065041c9f274cfc59937252725e21e63330c
+lib/codeql/rust/elements/internal/generated/TypeRepr.qll 1e7b9d2ddab86e35dad7c31a6453a2a60747420f8bc2e689d5163cab4fec71bb eb80e3947649e511e7f3555ffc1fd87199e7a32624449ca80ffad996cdf9e2f3
 lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll b3780c99c5d57159bef4c6bd2fd8ec44ebd1854c892c1ca776c740f71249e58c 2fd451cbf0a779e8042e439882e7d9cadc19d1e596df3bbb086d16f2596407c7
 lib/codeql/rust/elements/internal/generated/Unextracted.qll 01563dfd769d6dc3c6b8a40d9a4dc0d99a3b6a0c6725c180d2bf4d7633929a17 a93ce90f8c03f4305e59de9c63f089fc7935298fc9a73d091d76933cf63e790c
 lib/codeql/rust/elements/internal/generated/Unimplemented.qll a3eb304781991bff1227de1e4422b68bf91e7b344e4f6c9e874b324e82a35e60 6bc4839fda3850a56dc993b79ef9ba921008395c8432b184e14438fba4566f21
@@ -588,12 +588,12 @@ lib/codeql/rust/elements/internal/generated/Variant.qll e40dbb23e07c5b70adc577ef
 lib/codeql/rust/elements/internal/generated/VariantList.qll 4eb923ca341033c256ca9b8a8a5b4e14c7eac9d015be187fd97eeb25dfb1e18e e7865e975c35db49cd72cb8f9864797d3cfed16c3a675b5032b867ced2bbb405
 lib/codeql/rust/elements/internal/generated/Visibility.qll aba81820f30bed0fd2cd06831f7256af15ae32525b2a437896420b4cc067ea38 d6aed90b27124b812daf2ddd14b4e181277cbe638b4ccaab74e27681ac30e4ab
 lib/codeql/rust/elements/internal/generated/WhereClause.qll d6c8f72bbec5d71c024f0d365c1c5e474f4d24ded0d34c56c1f66b1e4a384e9d ed14311d140eee00d3b26a4972f53e20d5af1bddf88fb5618e7e2d3ae1d816f3
-lib/codeql/rust/elements/internal/generated/WherePred.qll 342050e824ca6eb6116488d46cfc03efa79193b4de6049e1f5d4a9fe527b3036 ed07a81de7d63f853c93cbb7291eea3d7169953e34c2f2f98b570028dd1f8cd9
+lib/codeql/rust/elements/internal/generated/WherePred.qll f5fdfd692c0d781d58847b86e389ba79489e8ef84e873e2b01d1d4e660e938aa 88dd90e1669487c023a74e48928162dcad7d122296fb065a23376e944d7989fc
 lib/codeql/rust/elements/internal/generated/WhileExpr.qll 7edf1f23fbf953a2baabcdbf753a20dff9cf2bc645dcf935f1e68f412971a8f7 d2fa7ada1f48f6b4566c75747584068e925be925d39d6e6ebf61d21bde3b6522
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
 lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll c5dabb77abc45a329a4b90c80e421383e558ca33bb6392350a1ce6c7bea84adb c5dabb77abc45a329a4b90c80e421383e558ca33bb6392350a1ce6c7bea84adb
+lib/codeql/rust/elements.qll 35959f2de54b6ee534fc592e1928c0829aa6e881e281a5acf724c10e4c685070 35959f2de54b6ee534fc592e1928c0829aa6e881e281a5acf724c10e4c685070
 test/extractor-tests/generated/Abi/Abi.ql 7f6e7dc4af86eca3ebdc79b10373988cd0871bd78b51997d3cffd969105e5fdd 2f936b6ca005c6157c755121584410c03e4a3949c23bee302fbe05ee10ce118f
 test/extractor-tests/generated/Abi/Abi_getAbiString.ql a496762fcec5a0887b87023bbf93e9b650f02e20113e25c44d6e4281ae8f5335 14109c7ce11ba25e3cd6e7f1b3fcb4cb00622f2a4eac91bfe43145c5f366bc52
 test/extractor-tests/generated/ArgList/ArgList.ql e412927756e72165d0e7c5c9bd3fca89d08197bbf760db8fb7683c64bb2229bc 043dba8506946fbb87753e22c387987d7eded6ddb963aa067f9e60ef9024d684
@@ -604,21 +604,21 @@ test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getExpr.ql 6920b53262
 test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql 60a0df80fd34ca5c960b5e060c7090f8bbb8af83aba7099aa298a80e19a13346 c41f80601c7f50eee01c0ed7587e0198296d6a8a5b95c98dd8f865901d34ba5c
 test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getAttr.ql fc6ca212aa633b73ee21f7564631c9ad345f15839656d88940dc686cf076a344 d580a367305adbe168996a294329b1adec36956a500ae9717a4af78cb2bef4e6
 test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.ql 6b00037350fc36cc46345a290bda4c4d4ff99050b970d23eb94294313046a884 0687638b46e43bba9dda35d78ff7b40f976e5e38271eec77e7a21c28349dc42c
-test/extractor-tests/generated/ArrayType/ArrayType.ql d781ea647d60218777261d82230bd85f989a4768a043e736d268363b5a777390 b5c7fa0aa1b8b1f3a82b8af7254bf20efd3477bba83ad53530959d1733636604
-test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql b6a250873bc2d553219b8301a15bd19a4044f590085992c532a800bf3ab744cb 5e6b9dbbe2d3ea7f6fa3fba4811517a528d5eb58169b69d1b9113e1508c6e627
-test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql 1c23613e509ada3ffc1f727d0db7c5955dbc104d886fe5f9d8f39413b54d16b0 a662d234e1e54159d931a873f20ed8953d9b27778c7a6ca898f86b31d1dae0cc
+test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql cfb831ccbc04092250931e0bd38c7b965fe0fd868081cd5f49fb11cd0da9aa0d 51e05a537928d7fd0aedd800f4d99c1f52630d75efe78bf7b016f1ad2380583b
+test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql 38db5e08b7a78f52247b9894fe2f3dd80b89efd2a3ddce446b782f92f6e2efad 8a4d38deac59fff090617e928fb698fc3d57f3651f47b06d3f40dd4ba92b2c93
+test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql f74222b11cc52d3ac79e16d2943c1281c574fee954298752a309abc683798dbb 9701ebe468d76f72b21a7772a9e9bb82d8fd0a4e317437341f31f8395780dc33
 test/extractor-tests/generated/AsmExpr/AsmExpr.ql 1273efcd8aab7de2a04ead74075d25c8a22afc9f0e6a3fb4322e3508a2cb6f84 cdd5389a269c048f56afaf3e93a0fb076ba1f445d6dcfc6621d8a324cac2f421
 test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql 93e644147ddc4de00c882c32d17ff3c22822e116b67361d52217619153b7d4c4 4c0c3f72707f41e879426ff75c5631e9283dc0507316740bec22216c5feb04e9
 test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql 4a37390e948fe336b592342b0c2b63afeac3000ce1416f5875cc9b0ce5a826e4 d32df64ddc3ce1b0536018ddcff30a24d9099c67e6bcbe9a4693ffb6e478361d
-test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql 2bf498a1e318cadf66f9f6341b41247c09070dbbab6d15ed4d3cd986a7f7da85 24d62bb3cb0a97c0e6180221e6cc8be86d9616021f8ef53175bbeabb5151a613
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql 31b925ef046811d8f02253619b4346ed4998fc32230c025edd971d3167c15e39 f7974a74e5673a6d7665d48796561ca4b3231a06690d3544186078da467c86ff
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.ql c81e25fd7885f13c0500e8f9b84195876e70f2b25ad604046f497818226c8542 62ac0e7c82da169c248e4f9e0e8f866d2f4e599b03a287c2bd407b95a5d9efc8
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.ql 4d20375752c000aab8d2e4988fff1a5c95689d114c8d63f37b389b95000ee873 957e360a4eeefa2536958770a7d150fda610d1d45c09900dbe66e470e361e294
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql 0fbb10321c355b15a9fdb2022af254d9d50b084117e47abf4c03bacc6189c9dd 084624f77b21062822fd16441e0c05e7820140bd2e468aac624782f0c4474e26
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.ql 586cb26683e522469a5094d359be4d8e5c6a3a74c1621a059bfcbbbedc0e34b4 84784b38c24313f3ffc88371421550922d9deb44d09ca7727ca77e892a672dc9
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.ql 3e18791a74c12d93ac8f786aa76bd836876052837bb9f0b25222cde47c55e419 b53bb52ff98c1ca0ba09ffce034a97ddd86e32828df7acb9bf34e20c4fb19664
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.ql 37252b5cee5ae64c36612aea57a6766bd34254ae35b9774642a36a8222aecfe6 c1f587d52b39c8aa66b9e6e4f36f40bda17dfcd72714ff79a262af99f829f89d
-test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql 6973aa12e00987ad1482401fbc0855a5fa585df5b3d44e2db4e81a84e5af46b1 791822b44c21f78801c8360e2ee4651352719204d9b3ce75bd2d77e5f805f509
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.ql 7e006ac8e8574c66a312b1389c7a85a83561b946e060575cc7234ef523b1a3ba 6123b375796c014a0bc96d39877b3108c13eff34536aa68402bda85511da18da
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql 0e41d63d34076111cdd00ba08e93da36411491ea6eafa2e61e94ea6d05e6bfa6 7bf0e678fe310f9085199877ac2b0817109cd10d26a3179715493b54a2cea649
 test/extractor-tests/generated/Attr/Attr.ql 028ac0a387f674205c5ef903238872ab1b6b7e2201f58c31776cdf740daf437c cb56a22887e0737d28034b39d7c3fb37a3d6eb1f34ce3d112bcea2f0affb3b13
 test/extractor-tests/generated/Attr/Attr_getMeta.ql f1e2df2bc987c670e31b454ab51b3028efc1018fbed2298a8c97f554eb1862f0 a9115ced872c89edc398bda1cbd54068f9065debc14ea5ac887ba13ad8f4e3d8
 test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql 8dcc94a553fbddf17dfc619fbac563a9dc4fc6029860e10703e9ae9765d9ab66 52e7f0c98e6ab5dcef04b2ab5283ecde76e61a2297aa2080d16998f93dc923b7
@@ -646,10 +646,10 @@ test/extractor-tests/generated/CallExpr/CallExpr.ql ffb0cf1cb359a6dcbdf792a570c2
 test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql b022e7b6b6db9932e787e37b7760c6a09c91140a0368940374a2c919688e0488 c20849c96b53c96f6f717efff5e8b4c0e900c0ef5d715cfbaf7101c7056ad8f4
 test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql 1ace458070875b9ff2c671c2ee18392ea7bf6e51b68ee98d412c8606e8eb8d33 4c35da8255d2975cef4adee15623662441bb8f2e1d73582e4c193d1bc11cc1b5
 test/extractor-tests/generated/CallExpr/CallExpr_getFunction.ql 060a6c8b5b85c839b14fe96f9e50291a7a0e5662a945f4f337070f782ec76715 e9a1e44433936146d87be939aa160848b9a7d7333c36da601fb7d1a66d71eb59
-test/extractor-tests/generated/CastExpr/CastExpr.ql 2ffb22ebc6e47953a49162488b3605d36b9d89330b1e71187066e7bbc40a22ad 7621a39d49f573b9862b9a4e1021d53205670ee59b49e4d81128637926f76485
+test/extractor-tests/generated/CastExpr/CastExpr.ql f8d889de678f09c32b8e999a1667aaa38366a005d37a537883bce7ea576aad66 488f8285d6af8644968c19488ada65c8f4b7fd82f57271cb290b4896a675d2d7
 test/extractor-tests/generated/CastExpr/CastExpr_getAttr.ql 5d5d98172e495cdb8b5cea9d6588c4c245107b441464e3ffd6c27668af11ab4e 5820bf083aaa4c3275004a2cd9eeecc4b45ab96916cbc0655a1b42611c540715
 test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql c37186b8f3e3dab8ae28c0da7263ff7272c40501beb16736ec0fb8990d285e22 59d50d7349234afcf84986b7570db9dcd342e16812f7c46199d4736cdfa5462d
-test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql ad5d6e260e1495ba360bd2ade3b60f09705a86a08d618acf8c4aff342c8ee200 c02c1dc65ba9160bc28827e40473915de5403bdc91c16d9d8b6778aa97314a1b
+test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql ab6b0a61adc404c89c0e2e1962236a8e703fdc5092512bb4a5d9995af8e13c7b 4e7f6b6f58a1ef34ed45e31e35154dd8dc59054ebedcaa87200c84cc727ef1dd
 test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql 42516df87ac28c814d65f6739b2ede6eaa41c505d64756a3b8c7e0ca79895230 8b840f92ec033a4ef5edbe52bed909d8be0fffddf6d3e4bfaf9a8bc174fa2f2c
 test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql 71010c43a78a7abe8e63c94353f4b7eb97aca011755d200e7087467c1e3b7a68 2c834328f783ec5032544a692f7e23975bac0228b52b9f8fde46ef46a5f22a5f
 test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql f25f9b32e5c0cd61e4b75053a5af4640a08b115ea5a4310ab95df450f6dfe1c4 9b731218857fa16776e29bce084c2ec1526b24e15f46d4f24047917d77d4646a
@@ -659,28 +659,28 @@ test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql cbfcf
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql 68ce501516094512dd5bfed42a785474583a91312f704087cba801b02ba7b834 eacbf89d63159e7decfd84c2a1dc5c067dfce56a8157fbb52bc133e9702d266d
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql c95bc7306b2d77aa05a6501b6321e6f1e7a48b7ad422ba082635ab20014288ae fe72d44c9819b42fff49b9092a9fb2bfafde6d3b9e4967547fb5298822f30bc3
 test/extractor-tests/generated/Comment/Comment.ql 5428b8417a737f88f0d55d87de45c4693d81f03686f03da11dc5369e163d977b 8948c1860cde198d49cff7c74741f554a9e89f8af97bb94de80f3c62e1e29244
-test/extractor-tests/generated/Const/Const.ql fff4c81591a1f5e691f2ad242e8fe8e2b0d6b0f974e312a2a0bdb7de80b985b5 0cdf3eba64d5d66d5069727bad08cbeb1266456f61b3967d27f542412cf56d47
+test/extractor-tests/generated/Const/Const.ql ef2d2730e08ff6c9e5e8473f654e0b023296c51bc9acfbffd7d4cc5caeed7919 906f8624b10b3fade378d29e34af8537f86d9de16a22a188887ecfc165f5ded9
 test/extractor-tests/generated/Const/Const_getAttr.ql bd6296dab00065db39663db8d09fe62146838875206ff9d8595d06d6439f5043 34cb55ca6d1f44e27d82a8b624f16f9408bae2485c85da94cc76327eed168577
 test/extractor-tests/generated/Const/Const_getBody.ql f50f79b7f42bb1043b79ec96f999fa4740c8014e6969a25812d5d023d7a5a5d8 90e5060ba9757f1021429ed4ec4913bc78747f3fc415456ef7e7fc284b8a0026
 test/extractor-tests/generated/Const/Const_getCrateOrigin.ql f042bf15f9bde6c62d129601806c79951a2a131b6388e8df24b1dc5d17fe89f7 7c6decb624f087fda178f87f6609510907d2ed3877b0f36e605e2422b4b13f57
 test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql 3300b902e1d1f9928cfe918203b87043e13460cfa5348a8c93712d2e26d61ced 71e7b80d3290f17b1c235adaca2c48ae90eb8b2cb24d4c9e6dc66559daf3824c
 test/extractor-tests/generated/Const/Const_getName.ql b876a1964bbb857fbe8852fb05f589fba947a494f343e8c96a1171e791aa2b5e 83655b1fbc67a4a1704439726c1138bb6784553e35b6ac16250b807e6cd0f40c
-test/extractor-tests/generated/Const/Const_getTy.ql bf9abfd2be9d22193bc6be9916c7171d79ae7fcdaabf1fc9659997d11d2f074e 133348f60312055fe112eca3a0ef2e1e210b1690261dd9b06979214908d59097
+test/extractor-tests/generated/Const/Const_getTypeRepr.ql 87c5deaa31014c40a035deaf149d76b3aca15c4560c93dd6f4b1ee5f76714baa f3e6b31e4877849792778d4535bd0389f3afd482a6a02f9ceb7e792e46fca83e
 test/extractor-tests/generated/Const/Const_getVisibility.ql de6b2e9d887316e279b45fab7887980ca7d93fd32c2259f3a06de2b6e2957c12 2f135cdbbb84b43d282131edb7eb4df6caba61bf7421881a49d4679f0f44f661
 test/extractor-tests/generated/ConstArg/ConstArg.ql f1422b216eb45819ff41f0c19e0f88aa184ddd3fa2984ba22ec46df398147fc3 d2e4f367848c2bc4f6aef51c1dd8180035c39919430082c83f18a3f324228df3
 test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql 317fd83ad51acc3ff3dfab71ebb1385b67d49404c1d7b3804a8ca3c099b84e99 91ecf5ebbfc1aab286dce708680f0be97417f9755676db7479fa6836e50be845
 test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql ee17b4deba9c503130e3ce565102bc8e181770efcb1309be9c822f0a7ba6fc17 638ed17b5c009e71b31f580c4060ba763bd4208c3984b6c032183ab46a4dd43d
 test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.ql cc06e762e1652e467c7cf02c34f17c621fb3a938f294ee527fa04ed78c8701ec f863f8f6bfc9d169b585ae56b4e4ac0fc1603fd14775450e950cca4d5ea28e8a
-test/extractor-tests/generated/ConstParam/ConstParam.ql 1c2ec1a00ffc754ade227536f3efe789cdbee714fa003abff5e0221b9b53d08a 6f24ef0b280b18603a6efd217c691c4249898be95dafd5ff5a586cb2f2ecdf40
+test/extractor-tests/generated/ConstParam/ConstParam.ql de4a92306dd3f65e0d308d34715f388815dc70955b819c627f5839cbd9d8b464 ff98827d3ab57bfc48356072de0172e8e1c2374dc6a086b1ad721b6d9e6038e6
 test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql af8949f1ea039a562a3b3561185a85f7f8a871bf27dba0580782f81c62b6508c 2874783b84fdce47b809f953e02c36473cad6a2d3dd1c0f1a9cb14a3e28b9c30
 test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql 021630468422c30e7aa623bdf4e97f3076e68087991723c624922b1ee608d173 9fd78738cfd0455be2c655852f6c618e901af80c6b6791396d9683c118a44e91
 test/extractor-tests/generated/ConstParam/ConstParam_getName.ql e2e9b75dd7ce501793efce75079aabd3851b91aa4d437972693bacd7b04859d8 4d2326b39af870a2ef8b37448f78395cdb5c1e94df88f137ef71f8fd3548cd8e
-test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql ad3f1ee12d3ba8e851856cf3e75566791218e40649a8bf54b1f08764c8b5feec f4ed7f40f83f59df8dd2f53073f73ee94c2ef6f6f77963f81ac8c62dd88244c9
+test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql f25a4695e06a6410264e979c7a4421253437cbab5837afafffbe69ecb384ce55 4b7ead1298ea0b5e12dfa2d75aa4732e1070c6880982a9cbaccc8d129956a232
 test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 971ccb238aec663855745fa2669d5f8973a4e6c76bacdf0deaf23522ec1cf80c 4e3ceb4c4cd833ad8311bb02e5cda18163082e341cd8a3def60734a53cca8929
 test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql acb261869d3b3c65e364e7b6fbd7afdf5305806d4417b05044beed9a81e66ea4 af35ce0aee87ddc7a0cd34be4a480c619940d036d5cecce0e4e1fcd75b7c553e
 test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql 39dae9872d92fa9b15343c93da545c2b0e15b4f27f2296c200fd4611b68858d5 52a209022e3b83260b4ef5513ffbcc1ca1f7c21bad2c721a0d3698793d2161d2
-test/extractor-tests/generated/DynTraitType/DynTraitType.ql db4cf318a76eaedaa9a9deaf11009a24497b88557439c2e0560290efe950ca05 e0fcd8be6bbe2e305ac16e25925a50206f36cba25cb0bc4c7e9b166d2ee6b19f
-test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql d04a1836c28f14884771f5868d5a3f551d9251c3c3a6c07a4dd9dbef6b764875 9c590f1ecd375c22fbc0ad5657243ef40fe7a7684ee81e57e7efbb73544d4398
+test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql 513d64b564f359e1022ae6f3d6d4a8ad637f595f01f29a6c2a167d1c2e8f1f99 0c7a7af6ee1005126b9ab77b2a7732821f85f1d2d426312c98206cbbedc19bb2
+test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql b20720ff0b147d55cea6f2de44d5bf297e79991eaf103938ccd7ab9d129e9656 eb8c9db2581cea00c29d7772de0b0a125be02c37092217a419f1a2b6a9711a6c
 test/extractor-tests/generated/Enum/Enum.ql ed518d828d8e2e4790849284de1d0d5e728dbc2fe5e9f187e8ebfa2d503efd5a 7092b963eb133371e1cbc09d45f8c2308d7093523140b351d67073a8d258643e
 test/extractor-tests/generated/Enum/Enum_getAttr.ql 8109ef2495f4a154e3bb408d549a16c6085e28de3aa9b40b51043af3d007afa7 868cf275a582266ffa8da556d99247bc8af0fdf3b43026c49e250cf0cac64687
 test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql 76d32838b7800ed8e5cab895c9dbea76129f96afab949598bebec2b0cb34b7ff 226d099377c9d499cc614b45aa7e26756124d82f07b797863ad2ac6a6b2f5acb
@@ -712,19 +712,19 @@ test/extractor-tests/generated/FieldExpr/FieldExpr.ql 1b45da610feb62cee42f7a3866
 test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql 609c4f1e275d963cf93a364b5ec750de8cb4790abdaa710cb533ff13ab750a4e 8c2aa84b1ea6ef40a7ee39a2168baf1b88323bfbc6b9f184e7b39631765a48dd
 test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql 57df2d733faf3e3e30ae106d8423aab612ab0ddf8659da008e384130cf1e8023 1e240bee8e83dc26f78d2c55464ca1fb88d773691d47aee9a2182c90f57eb8f1
 test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql 8631f5e8bdd72443a1ee3d667ee9136a51ad49dfd206612a36b79686da1beb19 692aef607108b8e3eaa78b8c915f2fd1d310905f8fea770b9694722a9a2a6232
-test/extractor-tests/generated/FnPtrType/FnPtrType.ql 50b76d678582cd0b8d7cc4a7658d5009d660bafcec6bd9968c9f60a7f547fa23 5bbf2504eb835e231a2355bc5d099322423c49c6af371902cf20a150e360cea7
-test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql de1706382c2980c02dbdd295e0a2320c992afa3f19af0c2378b9980a7cd0c481 a3fa36711949d9d5ac53cc5dd39cb19b397c3f2e47c1d457df470c6e5142f9be
-test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql 9ea393acf37919e2fd1bbc16e738440e00a56552bf80baef9bfd2a9a405afb93 3b4237b22eea569cef0081eb3ea16b2d0f01f8f070f21e16390267e9cbe0cf57
-test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql 57f662e4778e1bf4103f061bb8085def0708528f94045c9ff4a95ce802fff13d 924b924c7d766458e956afa0963e6eb1bfc083e5f9aeae64cf2d08929f79612c
+test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql 277dc617dd193f414c777e85db358f6dc5ebd7c029ac321d92fc6f1036da6abf 2c1a245975852e010552b0e0157b0daac7137cb25aa059fa5cc3adb43544a52a
+test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql c4a7519f9ab86de609a0155d41a0fd6cdfab6bbd7ffc41f3d5ef49565bdb5825 a0404f9a702f007d78f24291e80e939ce3ed2b603e436998dd1337f978499137
+test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql e097544fa9a1c173a996f323a90aa2b82aa6f12f30cd602fbcf0d4bfaf136311 6b5f8a4e4bee41343d075561005442c89b2b16ba547226f54c060c206b0b9e26
+test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql acd208155569ff3e9f4560f274560f1fb08585f18bfde74f3a011b469a492096 fc624e3dbe69fbda31ffcf86398213423cfabc4da33ae5099caed1f3751dad25
 test/extractor-tests/generated/ForExpr/ForExpr.ql 1f8b7a9bbe7a8c077864be64dc51d91ec267c4f34f1cad80fc79902cc0af04ff ae999fb206b04ed81fa08bdd7617cbfe932c5e4109285e10108613cdebba8f7a
 test/extractor-tests/generated/ForExpr/ForExpr_getAttr.ql d3399b7453e10ff48efc79ec38dd9b6e06bb472b9c39f559242d003e7f63b1d9 ba37e6bf129e1c2f9094e093bbfbf41864f2cb7725a64334f9443270dafdbfdc
 test/extractor-tests/generated/ForExpr/ForExpr_getIterable.ql 90a6540f8a91cfe3ed1bdde1e680786ce5a00edbb797a8fe70bcc0507c438fcc 65c67ad5890aa502628ee73efd26bcbd4597a8bdfc9839233ede9e26393638f8
 test/extractor-tests/generated/ForExpr/ForExpr_getLabel.ql ce90da75e040f448d524187357f3ceededba72407a84c1dc8e1498ed9788044d 0e23d43e0b3412fe90c6a5a4331f8da85eebe19e05b8c7d9710056857280797b
 test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.ql 21657e470752bd83e05e176c2ca9371ba0f7ca3d1f97f764a42dff3caeb46ff2 0cafad7adf79ce90f475465b4a144e6529c6345504282b1ba3c6a12ff2e99892
 test/extractor-tests/generated/ForExpr/ForExpr_getPat.ql 1e0205a9b3a58fd2ddba49ef1b13a82c812519604d4c5bc02f23cbb6ce960016 d00efc63d714b1c76e4b0a67195d4e605f43a1e49d469f4f18bfa18d12280b63
-test/extractor-tests/generated/ForType/ForType.ql ba930d0c4fe52d57449ce4025b1c3e49c688afc5ef18ee8ac1ed7a9fd3eb8d41 08e9aa0301a942f6f9564ddeddc69606f3e2916e1b551cc56ae3b6048c56ce61
-test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql e25cd79737bbae92d8f417c6bbf6fb8ae660976b8005cd91d0900c7076fdd827 b1e32b7e3ca9f29a4564f83e37ae53de6baf04837a393e6dedc64a01cc7d10e8
-test/extractor-tests/generated/ForType/ForType_getTy.ql e932d3412828bb83afc42e2dc1a4cbe9fcf25ec9a9617ec138722f834091a61a 298fc9df34b2cb436c8f180c4d229341ee4a73e3c451b905f017f32a6f65056c
+test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql 38fa18958dc8c1564abf0c38ebc7e76bc64904f9774a99e46504f903e9c19379 8384e007868981dcd8120f4ef52475ca99641a530a487cd9dc7eba98b9391060
+test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql 33535c02c7000e89e4d4e4560499b9512455fae407e72e05615b38f9e950c6bf 35a6aa7de0f627fb96ca7f4f2134b060a820327a3de4970fa2790c8fbea28a2c
+test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql f24d02c57af9f4fb4f5c3058e236a8d9b4c4f6f2aff84e65497f693309bdf93e 1c93d6214ee0a89e2bd5d0e02800e29e8a14ebd7efdb6a62380edb97dc902def
 test/extractor-tests/generated/FormatArgsExpr/Format.ql 25268dd7ad2a58b071c3a38164944c1b7389dfdda01c99ef2694a475596341b4 0a3f674d5a4f005835b9a5ba11a6e8bf58477829258f30ae7d8f76f8986f7b7f
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql a521903c73f79e2616f7b8ef76790e11cbf432f8437825d52d117da232022b9e 4cb195d09ecb51e5bbd5c1c069ec1720f74fc074efc88b0f5c07cfc140167775
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.ql 7e1a7f902fb661660760d2a2f3f4cb6818a0c9f5b5061ede6ae80223774e4e09 8a50f64cba6f56320631206c801160201e3c98e74367bb035d689baaa9b4e411
@@ -773,13 +773,13 @@ test/extractor-tests/generated/Impl/Impl_getSelfTy.ql 2962d540a174b38815d150cdd9
 test/extractor-tests/generated/Impl/Impl_getTrait.ql 3319d2649b4a7f3c501c8e16a1a3e5d74057c94c02772d33f19b4030daf934d2 3acca9d040c3f1d90ed26b159dac71625bea689221e180c856a75c2bab95d286
 test/extractor-tests/generated/Impl/Impl_getVisibility.ql 2497bb8c867297e4c398473ee7f0ec3693f7e894b84819f6336d69bebcd3af5f d8be2e9535b06471fa873af13b0223cc79d30d63a3f5e27a0f64874d60dbf07d
 test/extractor-tests/generated/Impl/Impl_getWhereClause.ql 269d4b0639db28a7535b2d745b11cda0885da7369f9cf4c4973a6ccc20c9960b c4baf89f68a173c1415baf90ddd9195e29784997a5ce45a36171485f6bb44c03
-test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql ec1474d83239bf546fcace59188d7ea42f64345b92cf2364117da05f1827fa55 7d352e1cb65bb80c479c7eb90da08745e51252a7e7fd20e33d892b351b5304e1
-test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql dfb41cb9140f96bad398278294ecf20909c0fbc32b361c3dfc97aef2b8b9a5a8 17c9e4687345a5a788b01fcd708e700195ca28524467a3144708f1dc4c6471e5
+test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql 309d5bed6a2bee9f728727338401c9c48841bd31d917dabb837bd88b78289ece 223060ef89358483a7aafed567a7b657d37eee023c49032aa55ad08a17c9e31d
+test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql 5e3561412a8f990e7f32fb99d40b82690a9281c850226fd301b9f656f7b9ad2d 4e23068d2635056a74f40bdfa809878e31a8172086f115985ca027055e8317b8
 test/extractor-tests/generated/IndexExpr/IndexExpr.ql 0a93213b755faaab84b7eccb5b8f3d8f8ba87910ad661f194e06917722dbf6a8 46497b3e92523c6c015373fe122678846618b45412b903323ff3644e37f2c52d
 test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.ql 360dbf8e7d69c691a1f4c9bb0aaa7860a6b0f09b21a1d1a6db908ec7a7d7561a e50b942f7592cb944f607bd64f8e4d4abac30bdc53f73b4dc851e689dce61be9
 test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.ql 841cacda1a1cd976229f2bd18dcee4315506105c2cb3789c30a7539fd6d49d0c 37a92e9151f10cf971b24f5af6e2ca6dccf87b6e0e0b2237a0564f97719a0d66
 test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.ql 1aa934524dd44009297ef89a657d1ba99304f6590514a0b0b51b2769780f8c20 a42f25640f0331318bbc8f44af133095580b8947309628511bf0b3675149506a
-test/extractor-tests/generated/InferType/InferType.ql ee94ff7a5d84299fdd6e52583fb2f548cff364cd3b5fe385707a2da8958bf641 9532163987d0c9f11456790d8c5a8249cb02f13526911bcfd4fc726db2e1aaef
+test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql a9c92ce8e20e427de3651fe59e6cbbe1b7efa8db9ef9d836da254cf07509e4ef 5ee2cb6ffcdc1fd2a7c190b1a98bb7369c114d837f7e232d425563255b71ce3c
 test/extractor-tests/generated/ItemList/ItemList.ql 6c1c8ef6da0fce64b1a5edbec98fe18910b0ecc390d1219cc08124ab51b13bf6 e94e5c8d1639c1ed2ba543a521a57a026e15ea6b339b6c6d4409dd30ae67a51f
 test/extractor-tests/generated/ItemList/ItemList_getAttr.ql 24d7a764d4f8997bb77e93c21e6e5ba7256ed11657bd6479bf42458b8e89b52f a6b4df0cc6bf79ab3f98c93eabbbd3aaf11ec2506a0e894fa1f51be90191d71c
 test/extractor-tests/generated/ItemList/ItemList_getItem.ql 6e129499f77f7dba287b2b31b58fe6d834559e27214797807bb29b2a401f1f7d e406c07421dd6382ea73308d9124c30e971591c9e4c797b3115955f22c93589f
@@ -791,12 +791,12 @@ test/extractor-tests/generated/LetExpr/LetExpr.ql c76a0c4aaa73f4064207dacc8d2c64
 test/extractor-tests/generated/LetExpr/LetExpr_getAttr.ql 911b143afebaa0a487b13d533f089c5b0eaf336a44a4cab42147c284338484ba 625c91fb6d8c2e3a9f13e5679cc0cd29329c6c2b213d2e1191e23db2b65841dd
 test/extractor-tests/generated/LetExpr/LetExpr_getPat.ql bc0363f77bc2ba583619ab7d309293ace0ed6a851bfb9b886f75729f96eb40a8 bc0cd9233b7904d8cc7f9021377120f5f4bcc5c7aa28b1b55f17bc738c434d78
 test/extractor-tests/generated/LetExpr/LetExpr_getScrutinee.ql ee33d3bbaf0ee7cdf9bd7b800e9684b5ac7ce8cf1939378cd460cb0c5ea11742 5d69e727b3e9d1ab4ce9eef702a7b1911515469625056bce87fac1d27ba863e6
-test/extractor-tests/generated/LetStmt/LetStmt.ql 02db64303bfe87a11a85663e4c79bdabd9ca13693f146c7923b47c4c92850fcc 9ec1326b8bc58b270b178a4c02621b1650d107de7c02a9408d97c59f0d8a6178
+test/extractor-tests/generated/LetStmt/LetStmt.ql 9f8cf125eae91b190e6f534541b5fb0a0ee2391803266e9d02ef5d605bcfed81 e5cb251e9fd1a0d22553fb9180f95c697d780f51f93121d2fd654210477641df
 test/extractor-tests/generated/LetStmt/LetStmt_getAttr.ql 68f69c4c054514140c0f0833a170e9f3facf950bd7af663ac9019f6c88ba0ea7 ca54d25cc052289458c7e34e40f0304bca2c412cecfb407f31279262bd74c15a
 test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql 6a5f0eed3ce3e8cbc57be6ec2b4eed732f00e084108d21a61d9ab28b65e494ca a48b426b97a6c347ad04fe2e592cd25b5c66b2a6a299cbf8c0da03e14304fd70
 test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.ql 21f8f1cbf725399da80c24c4d3ca27072758b76cbdfd726a7f1e851ea12e58fc c01a4eda22088184357288910fa41692f52486d60fbf7c0bc3b5b01f8f67fe07
 test/extractor-tests/generated/LetStmt/LetStmt_getPat.ql 978e4f7861c7b03e6f2a3a2f7ae82e9b72bb5ef000f111127cb583a04ea6f971 3c92dbb765dfb01c290413e538290b0b2bee5a83bcfee383d081f56202a784fa
-test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql a13e89ca2f87aa6e5e0cfce296b9515656f4bc9b5291337cf18c2bdd7a04c4e3 7c7c8ac2cc5112d74081a5c239358d62e082b48b361e757cea23022f5ffcf04f
+test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql 8bf8a99450b27bc97db90a323b19ab13cb266c0b6c4e7d0ccda80952f8f7987c 70227445fb87ea1afae10ced988bdfeff4a1edd3d9d787367a17ee121d31db0a
 test/extractor-tests/generated/Lifetime/Lifetime.ql 07b093285b08fddc149cbce3047700072874efb29d55e591c86d53e6432a10a7 29437b1b20f6321870837c12348d165729312e164ac4fac1029c1000e48d311a
 test/extractor-tests/generated/Lifetime/Lifetime_getText.ql 7b06b940145c3d1a1bb3aff67e8e106f902a737edf61ed91577cf3ca94606936 c70d6186c500fdf6bc9d9d028cf3ec093914e20ba9547a391203ac8c5df1d727
 test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql 4a0c2166d9ba79c99d6be430a28f79d3e7e971dcd96777e02c3fec56cec3ffeb 158bbf0f06ad36c81704d11f6318f80a0f7dd9c1a71409980ca60cac49dbe9c4
@@ -845,8 +845,8 @@ test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql 5306cc85f4
 test/extractor-tests/generated/MacroStmts/MacroStmts.ql 991042263ba99acef0972697ce79132e5650b27bf53be2f975a0da1f29940fd8 64c44e65b3c5d3de5f9532b4ff7ce54b39442b37f63da8b10d789b9b52b85a9e
 test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql 5717f20376600e7bf5e471beae1a7c0084f235f0931f8b3f25d2de94ebb86f8b e4685fd9d45b078a6402c285eed3a15cc4550f6656c8bc5e7e274a88d1c7e9b3
 test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql 8958b2212776f487869c29314e7d28f5871f5c3dde62fd9d6f87fb9e94204498 6804f5d4c0c5909689bdcdd5b8ec11ca7a8c0399b47695f66d2f99e39561565a
-test/extractor-tests/generated/MacroType/MacroType.ql 408327fdb4d7cf096536457401cc280f83cd7e4f6fa9aebd65e64031f6c119cf 0c502d25194ab96eb068a85e3f57a9217510a951fa923e9d7a20fd75412bd6da
-test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql 565be7a72670218d7999d3f6cec4e704b754c217186243f1b24c334589fa82e2 ba413c712783320188800e2a78738b09c40fe9a6305c08d9e67e971a8fca96ee
+test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql 49c0dbf587f84023025f90d73d54f5320993f4db7dcc90e21eda53fc0b4d1f57 0a0712171db935c549a9cfddb6721c2c188c584a67be85409ffc3facf6c9a935
+test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql cae14884e549c74be4b600a264eb236993d7b8ddd86589a9116ee2ba18f181e1 1d4ae2d8ed9ce0d7635a2ae447b41a328e59e97c6df7827ee7d5cf62343e86e1
 test/extractor-tests/generated/MatchArm/MatchArm.ql 512aa404c94ba40b859564f07e9dffe6a5e687fafb039556e9145f4f3742981c 529f96e38cede8a26054f8981d4ba1d189c17d14d0f92d622eb20acd8f3d7e5d
 test/extractor-tests/generated/MatchArm/MatchArm_getAttr.ql 4faf7a542702d13283262be7cb2e1cc3c862bc2e1953a460fd2bb5e75a7e9b1e 1d43f4d2a580d0ac309dd18a45a9693ab92107cafd817ccdb26fd7998728edf3
 test/extractor-tests/generated/MatchArm/MatchArm_getExpr.ql 116f02bef8650d27784a8657208e9215b04af9139d19a54952c6ba2523770f4b e0677aed6d53148e120fd0b03f4bc4fa108c6dd090f605c87b2e3ba413fb0155
@@ -884,17 +884,17 @@ test/extractor-tests/generated/Name/Name.ql 0a78cd5c0c703ff30f8e3253b38f9aac98a5
 test/extractor-tests/generated/Name/Name_getText.ql 5d223baad356308abc45cdce9ca9201d674de1cc1e9fff7ef55dd96082d59d99 6488ccc102ed4f0a2e1c5cef3f8b1adbe00d52c961573f1a16eca66af31e2d14
 test/extractor-tests/generated/NameRef/NameRef.ql f73d49d5c176cd7589f6ca148b0d0cc3d1084e27686910058adfd5764ef5767d ebff67ed3b325b01277e25baa1ad588e633ef8ce63209a72305465a0dc8002d1
 test/extractor-tests/generated/NameRef/NameRef_getText.ql 5212dfc1b65c0f724a72f5bffd82268d1f8ae287d3d61797673c29fd70d7ebd6 75c343614925c55a18917c07ef62af08c97c9cc714f627d1a27b9f26158a0bde
-test/extractor-tests/generated/NeverType/NeverType.ql 7da48f7c20733a77495718c06a96eb1a8ea5e825b95e585a960cf777edff1b6a 30e24cfcb4f2ae1b7862a177e622636b4563a1b1d348413884bc605302d31fcf
-test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql f7d7b30870567124e46dc81503a33cb6425fff51f99fa57894228847e68291a3 b0c242095e0df52687502baae97f36e0fc7b4e1e01cd05f75ff0cbe92a6e2f33
+test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql 6db9820e62fe7a7395aafb6966043bd24d89833fe59c825ebbd4a2504d58bcc3 85dc1500ba751a4b3fa432fe5f5cb0c104a2179ac2e73620ed9ff08552cfbba1
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql ba10ed5147469564e632f9444176fffeb1accdb14ad635a3dee76044e5782eca 3f894c494421d49d3f8f2593bccd261c9defa768bd252705d4a3671ca8e8255f
 test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.ql a12e828c85577184a41b255f54b10d4a654b57703074a7ebcfde2d43a358955f bc2590e76b60a3ddda9cc10903c68d07c6af19a593c8426d108a2a6520304145
 test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql 6d729fb91deacb1f620df5cbc86473183664e81849958624195da883c410a707 f3374c3d7306699d1f9d1c6c5788ee7c5a17103345bf53847be9d94e5fb9f14d
-test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql b8597637cffd7a492148020b306c4ab1d2f17f919f441f462ebc00d229b038ca 2c7de1df4351929c221b30e3cede4cd6981fe8a2c1861e194489981c65e00f33
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql 27f2d94699140805169a0c18068d78e10bddadb8db243bcb8957677c9d477935 4fb96f2f7a6e7217218adeb5069a7d4da548c6ac650683773bbff4fba32a99da
 test/extractor-tests/generated/OrPat/OrPat.ql 49d881b384acaf68fa79de46da997cacab3e75467641f61150908f4112c47fa4 5d721da23be44e79d7b8a0dd475119836828d6a1edaff2c55decea8da83e65b8
 test/extractor-tests/generated/OrPat/OrPat_getPat.ql d56b78287cecebacb25249380647500387e0d9e28be20034b8a12406a999a7c4 cba7bb60afaaed4333ea5ff6d3850fb44a8b42edee67d86fd16df85938454269
-test/extractor-tests/generated/Param/Param.ql ab8d0f8cc3c71f5d24be4aebde1ef7d016519490a9715aca6069e58fd11aeb1c 61197a0c2b8d6f0c5a9cddda39585dcd413644cf80e3ea28b037385142100b27
+test/extractor-tests/generated/Param/Param.ql 0a2375e240422ced3e7e6f16da3f538501bc214d0713cf5415a91b8f9f4554f8 12b286e5622e693dfd0a614b96c5d4f0a7dad3dbd033f78ad7318d1bd85a5eaf
 test/extractor-tests/generated/Param/Param_getAttr.ql e1dcf86540fd2971ced34a33b2959f001c3f654914d82e576caa4534b80fbfbf 987a826bf6dcd25c3426edb603a22f6caa030c82c1cb0e9e11062fdbfed23030
 test/extractor-tests/generated/Param/Param_getPat.ql 0c448e8ba8bf3432be08b5eb4a052aa19cccf0eb4596a3239481401dae9d2dc2 c943d4da36e1e734c1a012f092b2f597cb389a7ab33d5371ff8ee9c93e115ffc
-test/extractor-tests/generated/Param/Param_getTy.ql 134dec0c5562a8df68224069f10ee51c7dcc35e0b44a49c0e2078c305487db87 94fa72a213c37f2f63f03789a33e55fc5a22bd83cf0c1d293281bceffb63bd78
+test/extractor-tests/generated/Param/Param_getTypeRepr.ql 151a653a66722ec782af13980638b4156968a2bf1ee9221e983695712c39482e 597dd1b45078711d1ff2a5d3b0282d571b4d76d0d2e410c79a48ff9d5c8f80f6
 test/extractor-tests/generated/ParamList/ParamList.ql 4d879e6a6db24fb8d7f935c2dd332075ca4b2de41cc841aafec7e0b6b77f2cf3 b7e2357b77961f0f8315d3c9e8fde8578373ecfb9efba892416b31d7c168bb26
 test/extractor-tests/generated/ParamList/ParamList_getParam.ql dcaabf654941bf9afe50df3a5c61ef0eab50830a436eede98e30778bfd244a09 63cc7f529f96d5016804f50a385d8a736a534475a6340a8c2f51de99b54206a1
 test/extractor-tests/generated/ParamList/ParamList_getSelfParam.ql 310582a9921226a44e6fee2b386d48bf84388351204941dd12e3a2da395eefaf 6c2e0a6d5bc6db49430cf25501444da6540b7b2f9ac0052da93c8086e2af0c46
@@ -903,24 +903,24 @@ test/extractor-tests/generated/ParenExpr/ParenExpr_getAttr.ql e8b9016d2374d12447
 test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.ql a75dc46dc78d3b4a4f629ba16f7129ecc0ab90f60b651259d00d241b2886bf7c 32164d75418df184618501f41fbc0a81dafe1ad2dcbc9ec87bea909aaf05ae40
 test/extractor-tests/generated/ParenPat/ParenPat.ql 565182ccd81a9b420911b488c083f540d339eec6a9c230424800bb505df13a66 876cdca008ed32f415c9ee99ce7e66b276769d0b51ad7eee716e1317484a34ce
 test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql 96f3db0ec4e71fd8706192a16729203448ccc7b0a12ba0abeb0c20757b64fba1 0c66ba801869dc6d48dc0b2bca146757b868e8a88ad9429ba340837750f3a902
-test/extractor-tests/generated/ParenType/ParenType.ql 81c8ad667397ce36157941abd9b879e9305a440018853af4528eb737ae4d2935 3ef3b86203b0143be2d7f7f4833f55fd6c226cb9205e3c1940b6c2a1371622f3
-test/extractor-tests/generated/ParenType/ParenType_getTy.ql 41dd6605e7b348618156712b559e2f1b6aac02d6c727e8cbf8653530794ec969 30ac6611c730e76cfb75f98efcf817783a50cec0cf3b3197459d7642f74dde85
+test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql a96bb8b51d8c0c466afc1c076834fa16edf7e67fffe2f641799850dee43099a2 0e6c375e621b7a7756d39e8edd78b671e53d1aac757ac54a26747fe5259c5394
+test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql 64fe4ea708bc489ba64ed845f63cfbcd57c1179c57d95be309db37eac2f5eb71 0f4cbbfdf39d89830b5249cabf26d834fc2310b8a9579c19383c90cb4333afb7
 test/extractor-tests/generated/Path/Path.ql f17c1c4d23c0d5e9776cee84444f6ee7445de88afbc1f26c34b96e13ab618158 89499cb0f63b3634d6b5e2b8c4a13bd4401ce82e54af0ab46e41a34b0288eeb9
 test/extractor-tests/generated/Path/PathExpr.ql b9696cd7ad9f3874e4bc4b1b9c77f42f06ab6c61b77fb641458da63667087b9b db84a7a8dd05e30ff80733af01f08d43ff031bb4b3e3af06332a73ba7e7bbc43
 test/extractor-tests/generated/Path/PathExpr_getAttr.ql 2ccac48cd91d86670c1d2742de20344135d424e6f0e3dafcc059555046f92d92 9b7b5f5f9e3674fad9b3a5bcd3cabc0dff32a95640da0fce6f4d0eb931f1757d
 test/extractor-tests/generated/Path/PathExpr_getPath.ql e7894071313a74166bdd31d7cd974037fcd5a7f0e92d5eec42833266196eb858 46a06e8a1207e7a0fa175cd4b61068e5fd6c43b5575b88986409f0ac2be64c51
 test/extractor-tests/generated/Path/PathPat.ql 823732954a5882e33a37bd0bf0cafb2cec51659a5203a4831eec2516da0e49fa 54001149718a9ca15d8c0d4be63f3fe00a9f0d44fa1309e2f605d7932355ea5d
 test/extractor-tests/generated/Path/PathPat_getPath.ql 6c0c71c80a6e631ea7775ec8660b470ff6b264bab14a399606cf113b1fb190fc 8e34cbb4d064db929e94652e1901ec4f26affa71e30e556b7acdff71dd622cbb
-test/extractor-tests/generated/Path/PathSegment.ql efc39cea1b4c0b2b0da6434136334430d074699f84124d6bcf94c24aa854dc64 c0a4bd60c67665c058ca22a59e535e925fdb00dec95ffc5c71697fb0ed78a329
+test/extractor-tests/generated/Path/PathSegment.ql be9d62d38b0c7f8b5a8ea86dcb18c62f24930f5931f52e6073414f291d8c0451 31288b7728d45715acf6ab751b833b29473a74d54d9b26f83a73d8c91e3c82da
 test/extractor-tests/generated/Path/PathSegment_getGenericArgList.ql 8f6e67b3e316309f20e21d7e7944accf66b0256b76fa50ee9a714044c6ec8cea 15f10a701fc4d3f9fd6734da90790cdbc8a1ddd57bf52695740acedcb2e6e485
 test/extractor-tests/generated/Path/PathSegment_getNameRef.ql 799d284e2f9267d6bbe67aa7035e525ef347dc74cb3e2180e7b2171b5cb49674 592130bc2358989536abf62e8a261272c851483ede4f19783f7d61ffc1803e4b
 test/extractor-tests/generated/Path/PathSegment_getParamList.ql e1e7b9b5062f936c33b7e7e29b21456448242df4985c6cffb54900063cfd3e63 6568e851cb6bcb32622f89d01e3aa6e7dd21940d21572a9988584e34bdf25366
 test/extractor-tests/generated/Path/PathSegment_getPathType.ql 01942da6d0b10c1d15caec6abb8c53f1dc7f8c04a91a797f572063aa003dbc4b cb21e6cb160652527ba571265297dae86beffe191dd7dfc4d0beee45cb0cda29
 test/extractor-tests/generated/Path/PathSegment_getRetType.ql 36386a514bc925f5b17ad87afba9fef7986900c1b791732de061213c6e86743f f38bcee68c1da19e70bb1e1c4a4047c763a466f1b8ef2c4f65f8c724c0b58197
 test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.ql d1db51208a311c30af369ce2fdc3a3296e7d598b27bf4960b8b34622a9d9163b 561b1e38c6d8b301fdc016e1d012dd805fde1b42b0720c17d7b15535715047f2
-test/extractor-tests/generated/Path/PathSegment_getTy.ql a0ceaf3f37e521cc92c21cc0bae929499ef3584f86349ef34808c20963d31c75 d674e56e08a6d2a7d211503a466df2cc90c35a3951e41598febf62c8dc693655
-test/extractor-tests/generated/Path/PathType.ql cb67b05cf7e4f32cbd46ac89a15f6eafe3507cc655db0b9d54a1cf8e7fbcca40 890053e7fd8cd8a92015c09588c7c646f075901cddc3eb8d57210b02b23a5944
-test/extractor-tests/generated/Path/PathType_getPath.ql 7043c7939e4f835e4b2c7e3e207637c362d7a9dbdba0151b38c873fdaf43e7a5 ee2aad1b4fb2b00e1a5d39387848aa164a39e3cd49141f07c175b205c8451bb1
+test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql d9d8ff43a55671616bd5b98ff2c03690ec2661817d19a61edcc4b37d23e312d0 b4dc0ae4d7f03c98c23312b358d214565b34c7a028ba8983826c6bf5c1177eeb
+test/extractor-tests/generated/Path/PathTypeRepr.ql c2e069acc5111088a7287d98b4bd4bf44bd79c5a786b275f7448ebafc3613500 6e016750e5fef92a98bc5cc60bfd40d85fbb5eb2d251b4d69ffe600813f81df0
+test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql 49e96ea2aa482e3b80cb0e2d944055f8298f7fc55b36cea7468586c94bacf686 29b3c2140ac1bc6e0e6160140e292e2b84e13145c1553480e2a582cd7f7bd3fd
 test/extractor-tests/generated/Path/Path_getPart.ql 8aa45a0b58203ef1177166efbe1c2851faf4b4c9a453c83137f0c9298badcdbf b82d490d9b3a8237487cd5da8b3b6fc4aa477977b332a5c6539b3cd4e6d5b45b
 test/extractor-tests/generated/Path/Path_getQualifier.ql 9af95e22cdf3a65da6a41d93136aef4523db5ce81d38f6ed4bc613f1c68784d0 3102d9241a417a92c97a53ac56a7a8683463f1adc7a593cda1382c0d25b3f261
 test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.ql 7c0ff524595514630de4178028260d4832bfc4f57bfddec9f8e72a6c6dbf241c 55e617380476c183ef9259199d2cfd551b07466e94bc452c4723754d0c82691b
@@ -929,8 +929,8 @@ test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 44fb7174365c6deecdc22c72
 test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql fdad6ad5199435ded1e4a9ea6b246e76b904cd73a36aaa4780e84eef91741c5b 75d63940046e62c1efa1151b0cac45b5ec0bab5e39aec2e11d43f6c385e37984
 test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql 2d1d97f6277794871fbb032ea87ac30b1aa902a74cd874720156162057ea202e b1b9880fce07d66df7ec87f12189c37adf9f233a1d0b38a1b09808d052a95642
 test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql d27602e77ddf491a278426de65041dda8568f427d1e0ff97c0f23069ae64670e 4e4766e948adf88a6b003ead7d9de1ad26174fe9e30c370f1d3e666aa944df52
-test/extractor-tests/generated/PtrType/PtrType.ql 6317c79917e024d2162ae9089c17539fae818288f9ba5976fe39d004691dd343 d7e12a58475322a1292777608056ff90d7014b3e3a77bb756e233014d2670f28
-test/extractor-tests/generated/PtrType/PtrType_getTy.ql 97f5e6197e66c4dcf15d4a62692e30a26979f2902d83354911985d39c8560d1a 0b049b882a33be9746fbb704394a024ac320415cfd1707dc48fe114781558e36
+test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql 33b38895b3a25f0cbec7040861143bd5bdc01f98beff3a6b44bb77e1e0953d4d 9ad76676a6dcdee8eceaedbd759a089eb74fcf9c51308837027cd10253f18bdd
+test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql a1901323348a86a47b3d3d2a3d30b4f5aebf46744e4ecbcea650b3360024050c 58eb93dd76a927bb0cab1b25d01162c3b163e8a72ee13b4dd334e6017bb67db3
 test/extractor-tests/generated/RangeExpr/RangeExpr.ql 707c08aab49cc0a22c80a734e663b13ecbbddf0db28b6a25fdbc030a1ce38d6f 1f78950b30485cdde9fe7d9e416ad1dfdac8c5b6bc328172e6e721821c076131
 test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql 8767e670f88c2115bc61b16195d2c9d02bc074adc4ca57d2aa537c1af9b4c530 4fa51652c60ca7d06bd9ad604107e002603ee2a7b4587636f6b46b8e8060e06c
 test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.ql 0328c3d0597004f3facf3d553ed763566344f54e1b9c9e26f2f41b8146b6bdba 8e701b595631af117fd0a79154e298dfc64cb0874eb58018921f94076a0c7ebe
@@ -951,10 +951,10 @@ test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql b6cd65
 test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql 15b297e79c1ba8c92cb97148d6aab78ed1fd2c94f0d3a430ead8d541024e81ce 4f0a131011cf32e172f7bd027769e39642fb506d37b3d50b175c6ed5947d3d9c
 test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql c55e4775c8880c05944be04bdeb1c9e6bad45b922ba71ac3145acd83ff988e59 14ce98d1e5564e9e27c29110237cf6210d130ea887920b2b1bd34a853b7fcc63
 test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql f2dd6b85da1cd8195986aefbe7dc8171db6fbbe5b2612c4cbdd8aba052cb0c6a 2c19cb1510c215ddfa004d40bf30fc0fe0dcbb530c320b297541f1dbcb204143
-test/extractor-tests/generated/RecordField/RecordField.ql d503ee1b9de70830947f2b406df058a3fdff7d360293f1c70671bb7f21fcf514 08687d8737dd20ce4a699e2ba4a2313b18c08de593847bce4a13077b608900f4
+test/extractor-tests/generated/RecordField/RecordField.ql b1f14a17b6f2e581c2a1e882a7405351ded14c565375b99a0119fafed93a2b09 b7d74549a4f7556e79fcbdb79748905fb13d13cd01de3d551cb5898b1d0af87a
 test/extractor-tests/generated/RecordField/RecordField_getAttr.ql aa29d317dee23039a807df530a6f04b0678c4d1d34207a4381be535ff04af478 41c5778d6316eec19192334046ed110aea44a4c45937d5c355a9b71c54aa8e04
 test/extractor-tests/generated/RecordField/RecordField_getName.ql 1f5c47d41367bd0115df86f22a70d4621d7cbfb41554daa598da29f549479670 64535303b273f1c2027b6ce89b50816ad3cbbca9bf00b2b8402e36b26e675d97
-test/extractor-tests/generated/RecordField/RecordField_getTy.ql 601fbb244267f366ff989d3cf3d1ff29fc7c6edf415c7844f401efc7798f09b5 de1e54cd4330abed23312a32efdea35fcd8b2d6accf8d8f6f984fe27f4af30e0
+test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql f61cfcd0c682604b882a4ed9c746e6f6087e4798d7aaf9d29579e0e2372406e6 01371887fa82748ef196d2e9d27d26c586efb5b4f82d48967b5494723c54af4d
 test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql cc45e9bb9418d15cef07a1827358c3f18a8737324c8e6852591a2da70df89360 45557497fc165a212fffda71dedabc8159a4f72323430df732698a18922b366c
 test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql 586bccfa550243177d9fdfd6900a473f51a76ed360b537f19cb300330d5dad5b a063373dfdbf06b68c69694ea4ae72a26b906c910f9095894c09e72f8fb52819
 test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql 2eb92ef8528204f3f105c19a36cdc06b3b6d20242463ff2ed1fb81c544812a71 d69091899e7157099f117e14fe60cd3705cfda45f28f6a6a2b7234a4a9c1e664
@@ -973,38 +973,38 @@ test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql 477fb3fee61395fabf78f7
 test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql 180d6417fd7322cabf4143d0ddd7810f65506b172a5c82484b3ef398041636b2 a291f0bec1ec5b3fa6d088b3d1a658889b9a3521c39ff3bb7a5ab22a56b8b20a
 test/extractor-tests/generated/RefPat/RefPat.ql ba0f0c0b12394ed80880bea7d80a58791492f1f96a26783c2b19085d11e2fd2b 22aa62c6d4b6e4354f20511f8e6d12e6da9d8b0f0b3509eefe7a0c50f7acfb49
 test/extractor-tests/generated/RefPat/RefPat_getPat.ql 60f5e010b90c2c62d26674323d209b7e46c1c2b968a69765e1b1cde028893111 fe9e7dc6a5459250355336eca0bdf2a0be575b1e34936280fd12a76a004f7b46
-test/extractor-tests/generated/RefType/RefType.ql f6959c993a8e401a576c785fd1be4b910be218a212eaa9363ebf8f83dc2f1950 686678725a7f9824e74ec6dda294fc2233fd94aced8e2683b7019a1ce81f345d
-test/extractor-tests/generated/RefType/RefType_getLifetime.ql 880434f5908752adcc02d3645a48f22399250600c19e43c2da852cb6242e6a0b b8f9b9fab827972fd318d5edcaf37e4c7d0cf92261f9744e258537e6aee5a87a
-test/extractor-tests/generated/RefType/RefType_getTy.ql 0d5667542ad05a0da1a6a4c36882a39014c4803a76cadb11400d747b603890fd 2e6c3a56f1a7bbb72c181819be72d85c650af1df06f8582ae61bba9e165cf764
+test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql 0e543a2e907bec0736a4e3821e94a49ad5127a69dab88f89a4a4bd6ff9e6a138 fe157d0a00264e2e5b7eee7248b052c960915aac14543e16a31ef659ce84978b
+test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql 0fc1babe97a3c12609f30af8d68a2a25a588061fd92fb5a0d6ddb2afd0f87296 c9fcd48451faf77a3d47c4085904439243744119648e10499bc1b1533c5e14be
+test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql 63130e9884b588a2e0f076a00b55e9c3106826ab78f5e7ff859d24d4f1b4d0d1 fabe9cc6967433def8ddba298d5cb4d903f8491bc4ccfa1b36e415995da9b804
 test/extractor-tests/generated/Rename/Rename.ql c8605e5d8ebb39be238ba26e46861df493d86c9caf9aa9a791ed5ff8d65a812a 7263c2c2565e41c652eda03d1e1ddd030fea79a8e3c967909df9945e30ecbe68
 test/extractor-tests/generated/Rename/Rename_getName.ql 1648191216ece0e3468823ed376292611bd3e5dbe9b3e215167d7051aa03385f 381683d4637a1a7322c9a0df2d90a30a153630965e7facbfaccd6cdb5c1de2cd
 test/extractor-tests/generated/RestPat/RestPat.ql 0abc6a13ec82ebc923ce768344d468871a05a515690f0feaaf55b7967cf34a9e c2bc069de6927c6c04c89c54e694b50d6ca052230cc36668302907a7ed883e08
 test/extractor-tests/generated/RestPat/RestPat_getAttr.ql fb391ab265a454b10270136efd61c1ae9b29951cd28b0f585c6b6eea37c64745 6311e3ca49eb8a061684f8cebdfb11cc5ae09db6e145d1b2349a2ee80298cfe9
-test/extractor-tests/generated/RetType/RetType.ql 7aca20c92e840f930aacd0ef8e70840da76c02592ac2f2fd5a9bf24dc872c30e ef3aed1090a77684773c814692cfaee9cd245d88292cd75f1b5acf9005a2cd17
-test/extractor-tests/generated/RetType/RetType_getTy.ql 55118e2a41cc1a097f6a69d3b63f3ed77d5da6c02b218b69b1c93d605e7239fd b32abe7a3978fe858a53a5772faabf750b5d14880054493f5a99466092b10dce
+test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql 9183fb22ed8cab493719ab4c26e9129a033962330893c21a994ca9a98de86670 4031d0ba6f2ea3bd5116c594c053bd92f10f3dd2166e5ac7d6d6006fc6c1911a
+test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql 0cfb66dc354c6b58c695dace97c4d5ec2a730ba6076918be2beca4a4cedaae07 54a6299dfa05b7ef60feca77dbad3d0a444655df4d1d4c69a8efc3a425ca35af
 test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql 8e9eba0837a466255e8e249e62c69c613cb5a78193fe50e26a617cf9d21c995a f33f6cc874f74d1ce93a6975c88748bd5bca6dc10360f8fd59493d939be63658
 test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql 9fb7e1c79798e4f42e18785f3af17ea75f901a36abf9beb47a1eede69c613ba9 9cdb7cc4a4742865f6c92357973f84cee9229f55ff28081e5d17b6d57d6d275f
 test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql 7d4562efb0d26d92d11f03a0ef80338eb7d5a0c073f1f09cbb8a826f0cef33de 523ebd51b97f957afaf497e5a4d27929eed18e1d276054e3d5a7c5cfe7285c6e
 test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql 976ce33fe3fd34aae2028a11b4accdee122b6d82d07722488c3239f0d2c14609 906bf8c8e7769a1052196bc78947b655158dd3b2903fef2802e2031cffbc1d78
-test/extractor-tests/generated/SelfParam/SelfParam.ql 12ad3244a2700e13a84603d6992f0c872572bca68d25515a7a9414b3c96a62e0 70028e344bc4ab2937f391f1fd8afd1549935aa621ce2cb9944da6a1dcf4be27
+test/extractor-tests/generated/SelfParam/SelfParam.ql 1a75aa4caf4342365c74811f566359053a1a1bbff7058840891f4e050433ee50 a173a91b4c9d8af2f82d8c774b674e06c54414e2bae845695d06f6d27e6ff40b
 test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql 00dd5409c07e9a7b5dc51c1444e24b35d2ac3cab11320396ef70f531a3b65dc0 effbed79ad530a835e85b931389a0c8609a10ee035cb694f2e39b8539f8e54ba
 test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql 0b7c243f609e005dd63fd1b3b9f0096fc13cb98fe113e6f3fefb0d5c414e9a5f f6e06de8bcddfc9bd978c058079e53174edbe7b39f18df3c0bd4e80486808eda
 test/extractor-tests/generated/SelfParam/SelfParam_getName.ql 69207a57b415ba590e50003d506a64fd1780b27b8832b14f9bd3c909bddb5593 56fa28ba1222f45893237052fa5a9421d960e14fbf1396b2d1049b440c2e5abe
-test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql 521db95ede5184298ef05f78062f6c42152ebc60f1a395e162ceda73e4fe5d36 b1e261e0bef72db4bb1a5bc294b93497e5b61ba607588444154cacdb23ac15a4
+test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql 406c04fbb5e0f4c57a2f73dfd69aff7da95fbbe552dc7391b3332d4e451b1ff4 025ef82cd0bf947333253141a5c3c4990db47a699c21a2381089428d0d133670
 test/extractor-tests/generated/SlicePat/SlicePat.ql c6ff3c926ebbea3d923ba8ed00bf9cc20eaaee4c6ae49ea797c0975d0535240e 1b27e0caeb793da3b82059268b83bd624e81f215de42acbb548c52bacba3ed9e
 test/extractor-tests/generated/SlicePat/SlicePat_getPat.ql e2f892a3a4c623fe3f7e64e1438128126bc4d8b8c0f657ae53bb99d3209a3b13 af835d9ec840c63e13edc6a9230a4e34cb894f4379b85b463b8068de5a8bd717
-test/extractor-tests/generated/SliceType/SliceType.ql 2c81c68b54bf21d32f94ed66765642549540d3d179ac4daa52b597a3ad862c36 1d3b21af4a62a99776f3d569be3b85cac9fdb214d04f37ffb2f9f0759f520da9
-test/extractor-tests/generated/SliceType/SliceType_getTy.ql 0bc70c0e60fc3552584b07ba2a23f304b47ad24644e015674665d0182fa4d1e5 f6ec0703b013d805eec2bb11d28393fc750d000ff6c2188618aa333095c7e328
+test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql 59c4e943626b6d284fa30778437b0ac5b10243b2dd3081200ada18e5a5f75ebc a479a079c841290a42a86da71d0b951d6ff354a4818be72180e6fe24b3eecde4
+test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql a6604fccd54cf86fb2b929ffda248a2da207e0841a46fd5e80fc18e2efccd9ca f10cc6446549214d8929521f8794a93cfacdbd71cd95e05e585bd178af414e52
 test/extractor-tests/generated/SourceFile/SourceFile.ql c30a3c2c82be3114f3857295615e2ec1e59c823f0b65ea3918be85e6b7adb921 6a5bbe96f81861c953eb89f77ea64d580f996dca5950f717dd257a0b795453e6
 test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql 450404306b3d991b23c60a7bb354631d37925e74dec7cc795452fe3263dc2358 07ffcc91523fd029bd599be28fe2fc909917e22f2b95c4257d3605f54f9d7551
 test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql f17e44bc0c829b2aadcb6d4ab9c687c10dc8f1afbed4e5190404e574d6ab3107 1cf49a37cc32a67fdc00d16b520daf39143e1b27205c1a610e24d2fe1a464b95
-test/extractor-tests/generated/Static/Static.ql b4266fc731d027e00825cbb02d27f9dde50c7e8d32fd6b571cb167da64a8747e 9dd9c4dd56210adcfbd1bd387d79f27a30394e7b8b9c81cc2553a718f36cca5a
+test/extractor-tests/generated/Static/Static.ql b633f189040bc9d0592b77440b5b161b5c69cab97c4f47ef2c3754671fab0fc2 8dba58a18a217b741a7c474bffe0b3ab524cba8e1e4d6ddb22181170d2971fca
 test/extractor-tests/generated/Static/Static_getAttr.ql adb0bbf55fb962c0e9d317fd815c09c88793c04f2fb78dfd62c259420c70bc68 d317429171c69c4d5d926c26e97b47f5df87cf0552338f575cd3aeea0e57d2c2
 test/extractor-tests/generated/Static/Static_getBody.ql e735bbd421e22c67db792671f5cb78291c437621fdfd700e5ef13b5b76b3684d 9148dc9d1899cedf817258a30a274e4f2c34659140090ca2afeb1b6f2f21e52f
 test/extractor-tests/generated/Static/Static_getCrateOrigin.ql f24ac3dac6a6e04d3cc58ae11b09749114a89816c28b96bf6be0e96b2e20d37f e4051426c5daa7e73c1a5a9023d6e50a2b46ebf194f45befbe3dd45e64831a55
 test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql 6ec02f7ec9cf4cb174a7cdf87921758a3e798c76171be85939614305d773b6a0 c51567dac069fc67ece0aa018ae6332187aa1145f33489093e4aee049d7cea52
 test/extractor-tests/generated/Static/Static_getName.ql c7537e166d994b6f961547e8b97ab4328b78cbd038a0eb9afaae42e35f6d9cb4 bb5ae24b85cd7a8340a4ce9e9d56ec3be31558051c82257ccb84289291f38a42
-test/extractor-tests/generated/Static/Static_getTy.ql 1f282ac9c52b8d9efa1eb7f963767d0af28332c99baf283b3818edf53b3b8b9f 656cd5516601e21ffd54c51934bbbbe293de0b30a4327240208f5bd51ed524b7
+test/extractor-tests/generated/Static/Static_getTypeRepr.ql 45efcf393a3c6d4eca92416d8d6c88e0d0e85a2bc017da097ae2bbbe8a271a32 374b551e2d58813203df6f475a1701c89508803693e2a4bec7afc86c2d58d60b
 test/extractor-tests/generated/Static/Static_getVisibility.ql 0672b27f16955f7b0223a27c037884338dcf30759b7b8bb3da44e5d533228f90 0e4916f5683963041ef23c724ca8e16acfa370b583d90b76508c87131b9e1c73
 test/extractor-tests/generated/StmtList/StmtList.ql 0010df0d5e30f7bed3bd5d916faff7d101cc1edddceab7ddc12bb744f8e46cf7 aaff98988c68713b3577f3d4b4ed16b978eb11433ec7f3a32def82e96aac8c5b
 test/extractor-tests/generated/StmtList/StmtList_getAttr.ql 78d4bf65273498f04238706330b03d0b61dd03b001531f05fcb2230f24ceab64 6e02cee05c0b9f104ddea72b20097034edb76e985188b3f10f079bb03163b830
@@ -1048,9 +1048,9 @@ test/extractor-tests/generated/TryExpr/TryExpr_getExpr.ql 4ccd50eb4bdf01381eabb8
 test/extractor-tests/generated/TupleExpr/TupleExpr.ql d6caa8d9ff94f27f88d338b07cacc280289970931e101680c6574e32bc0c863e 70508104013003dcf98f22db6eb9b60d14552831714048f348f812807189e9b1
 test/extractor-tests/generated/TupleExpr/TupleExpr_getAttr.ql b1e93069613a8cd2b49af93a5cdd1571b343571e9c3d049d8bf19b25a461f9d3 be18008a00e3b0fb786f5dd36268201fd43bf8527d8a40119b147a3a8c973b3b
 test/extractor-tests/generated/TupleExpr/TupleExpr_getField.ql 308cd14873afedc74e3ed61d283f72da50008ce7690510c57fe0934c92158d58 5e3e23a7221486ead6502debb5d4978fb67046c8b0a5c8a688e4e196cb1f28a1
-test/extractor-tests/generated/TupleField/TupleField.ql 2dbdb37ecb22a05007713434ac747a348266bab2863e48704fff48a10eb01c75 4309f177306f8adea929c1cff809eb26e262ae12e0d95b22597efd36c9105bfd
+test/extractor-tests/generated/TupleField/TupleField.ql ec4f5a92fd702f8ff4540f5c681d79e197354244fdcc6df8a3c50f30f7c3c4c2 ad8c7f8316dc02238c40cc79d257fdfd8614b2db14a871eea849be6551e8f0f5
 test/extractor-tests/generated/TupleField/TupleField_getAttr.ql b6b6a5349fc6767b0081d737e818425f0c93be5bd8de47c29fd89b7812e3267d 23d82a649cb733bc8c1d1b09dde84dbfcc8f847ed35be986a9ca8717ea9e5081
-test/extractor-tests/generated/TupleField/TupleField_getTy.ql 291d62ba4246acad200cd5347ed1280d80595fdf663f0ec39389996c23745fd0 d364381e5aab8aca36be354af5c41b2e8b5e95ae8cb7a14a702a28f644d567a8
+test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql ce4b6f69779e9f3c5a8b5625137bac806fc929d1c637804edefbf804a66f88e3 a3b741a2f48cb1e275f978585d2a04a720e23a03ccc04d09eb229fec322f42e3
 test/extractor-tests/generated/TupleField/TupleField_getVisibility.ql c7af5373382394a686d12a23c4e688a7cc0dfe6b6cbee25c7e863b4713601ddb b174f30404e69eef112dedc8397ad444e968f12dde9befdccb051305d98a75d2
 test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql 7dc88440222ff036eb6aeabf9311568ea34f31f7c1ad19c71dd69a2dc17a6ed9 0255890d1389da004f18e8a0fc0b72d22790c36ccfacc6f452b269667f030f22
 test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql ad552a9c0b9964d1770f14cabbb436db60ebedc3c569006542a8eae9ddb30f6d 3a8c49d629376a9b8326138836b05ee2366b1021ffd19f5be74ab023e70aa50d
@@ -1059,24 +1059,24 @@ test/extractor-tests/generated/TuplePat/TuplePat_getField.ql f000bed41af031bc56d
 test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql 6e6cfba0d2565782088af55ca977ada3d8093200aa180a49a67c9a176c52c254 c10c93823a9d814d694ca88fdf65a9bf8c1bb178e50c08982a97aa8d445284b3
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql f3f2e23cc2a32aa5abc1e0fda1300dab1693230632b9eaa75bb3b1e82ee9ea1a 24b87a39ec639a26ff8c1d04dc3429b72266b2a3b1650a06a7cd4387b6f0e615
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql 13a06696bbf1fa8d5b73107e28cdba40e93da04b27f9c54381b78a52368d2ad1 5558c35ea9bb371ad90a5b374d7530dd1936f83e6ba656ebfbfd5bd63598e088
-test/extractor-tests/generated/TupleType/TupleType.ql e5951a30817b8c51fe9cb9435f75bfdca2a1277b2094267d3205e33ef1ee9a9c 9a4d57322ed2cff57057654272981b056f833136f983141b033afaf64e19c117
-test/extractor-tests/generated/TupleType/TupleType_getField.ql b73a8cdaf6ba46cf9b63d8819239d2d2c06b3496ed4768e8a387a7558178fbd8 6efbcf13c25d0ff3ed0c6d194ba44d2abfa620406badef8184953395fab92bb4
-test/extractor-tests/generated/TypeAlias/TypeAlias.ql 87645d4aa0e2c789dfd7111c6150e72c65b2e108b371bb5fc247aa8d34a25893 6335b4e56d998eed57d8f026d2d1dbfc018754e87c755e1194a2ef9f7a468233
+test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql 2f99917a95a85a932f423cba5a619a51cada8e704b93c54b0a8cb5d7a1129fa1 759bd02347c898139ac7dabe207988eea125be24d3e4c2282b791ec810c16ea7
+test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql 615acfcbc475b5c2ffa8e46d023fc2e19d29ee879b4949644a7f0b25c33125e6 81b037af5dcb8a0489a7a81a0ad668ca781b71d4406c123c4f1c4f558722f13e
+test/extractor-tests/generated/TypeAlias/TypeAlias.ql 637d4c982691942fabcc99ef4a1765ec794d1271bdd376addb55c9d7ea31230e ef81773e2f1260f66f23ce537080c3273b1cf74f96fba37403d34dc1ee1e0458
 test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql ecf4b45ef4876e46252785d2e42b11207e65757cdb26e60decafd765e7b03b49 21bb4d635d3d38abd731b9ad1a2b871f8e0788f48a03e9572823abeea0ea9382
 test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql cd66db5b43bcb46a6cf6db8c262fd524017ef67cdb67c010af61fab303e3bc65 2aebae618448530ec537709c5381359ea98399db83eeae3be88825ebefa1829d
 test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql fe9c4132e65b54eb071b779e508e9ed0081d860df20f8d4748332b45b7215fd5 448c10c3f8f785c380ce430996af4040419d8dccfa86f75253b6af83d2c8f1c9
 test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql e7e936458dce5a8c6675485a49e2769b6dbff29c112ed744c880e0fc7ae740ef e5fcf3a33d2416db6b0a73401a3cbc0cece22d0e06794e01a1645f2b3bca9306
 test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql 757deb3493764677de3eb1ff7cc119a469482b7277ed01eb8aa0c38b4a8797fb 5efed24a6968544b10ff44bfac7d0432a9621bde0e53b8477563d600d4847825
-test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql c4d56678981c78cd839b203dbd4a02dd30144db83329fb0015e90cf6c6138757 f9626eee79ce10727c6f13ed6a4819eb7da32827357a52939afaf4e71419af33
 test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.ql 309efaa32a840fb1fca7d34b7cdbbf51ab469707fa195b69a9f1a7d141db3a02 e12bf44d8858e930bdde80ecd7909b5405a51a1b00a6d2c8ee880e68dd622075
+test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql 64acc817272d5ee0ff3659a6851635ec8436a8f7944c15d19c80fffa2ad29eb7 db1e91971ba1ae8ba95ba8ac1dfa91f2fe0381c1b520518d80b344878357dbf5
 test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql a1851a78f31ad6e3e5e43537832701f4c420546c2c86449c8391d3cc366d5445 23c118f662dee5f0e286753d107165b1964ce703a1378765f974530929a32723
 test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql 0cd281b7b5d3a76e4ec1938d7dcebb41e24ed54e94f352dcf48cbcdb5d48b353 5898e71246d8ba7517dab1f8d726af02a7add79924c8e6b30ce2c760e1344e8f
-test/extractor-tests/generated/TypeArg/TypeArg.ql 8019f0eb5a64162df88e7e64ba0355578dad158b884c8eb42b2f10e093e52121 4871ac369925228978a1e16cf1393a449ea846657893d8a760fb46dbd6a0d609
-test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql 54c291039d88fb460b0bc6bb83938c3be272898512415d08abffea714a000275 3117f1bbc1168b0ff75948459673c50971e3e71b0bb966783a8dc44328803f33
-test/extractor-tests/generated/TypeBound/TypeBound.ql f49bc5b12f9817d9464c771bd35837c1ae6c8b3162ab6b0fc9b3e6748d18e87a 2535af71fa8e212d6f9b9e10ca0ba7958808dea4d1af432e1d5167a681d7779c
+test/extractor-tests/generated/TypeArg/TypeArg.ql 32366a6163dcb2fbe2e98d739cc049f410a6523a135310e79b98a4c760926c8a dd52b9c138197ab07b6abbb66236c37261b47cc3201b1e1ab6ccb425b2cc6f44
+test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql de9102f7cb306503d1858cba40a48b8f40e192bd11b40104453a303db5c6e241 65105b7b2ee346a37a3d6ee61d4c12e34d0cd6ff4a3d79ee0634081a6f959ef6
+test/extractor-tests/generated/TypeBound/TypeBound.ql e309b93e3788a0350a347b3dd61b779fe8b0320fa9cb0250ccba7c1ed476e79e 6b09a853d1b2528fcbc394aa0490efb2171d4c7c6e7e4f70e84e60bd0f6e2894
 test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql 7cf4ce64ea8048b85733fc2de627480465a616d62f57345c25bb62fdfda0ca59 e63b77ed3555b150cebf205016b1cc8d1b10fda315d5a21b3e60753ad602ea8f
 test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql 615b0f5ccbffc425a3fa9480197bfae649c072717697f59d2e9b8112d2ff3fcf 1f969aca15be820eb27fe80317ad7fd4ce60f1a0fbcb4ae98b04828b0aeca632
-test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql bded40be75f99b97869e5b4701a479db91867a861fb9f2071f4f7df0980ac6a2 6bdb30e50ba3ab7c2976aa602bae54a089019c8b81cab497c962b6b96362fbab
+test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql 5c77f9ba0ce7ccde5a512e1eb6887e1588789d2bfbaadefa42177a144ca56e37 122ab4c2eb6cf285a1ce8818c00f60a12a53765b6999879a1c3596fb48eda39e
 test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql 829c62ad88caa7707a4067c1a34f81971e936af1280a134b0b3532fbd4e4c887 10133eec05b902d5f0a6b3ed66156879914a83290014ba0ded26f1c3aaeb2b28
 test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.ql a6f6ec3f8d329da3509a8040ee2383ec6d9c66fe7c5685d94e90ac989a9e61b0 c812280f09658c63beb2a2ec0ab86e007819da08b6637bb4299c6ed6c90a4c6f
 test/extractor-tests/generated/TypeParam/TypeParam.ql bff624133257883477db43ae05cc17681ab20d5564c2025dc78758255a62eaf2 a25d4adbe6119f4f36fa57f08cf7ba52e0b54668047e685d811570e0126bcfaf
@@ -1121,11 +1121,11 @@ test/extractor-tests/generated/Visibility/Visibility.ql 417b501e0eef74006cdc41ae
 test/extractor-tests/generated/Visibility/Visibility_getPath.ql 53de9942208dff340d4665f602c519592c79b65dad5db217360fe23bb22b9318 6e4d2b191792d7a259f2edbbb2333df3f97c14600b04142fff4c86266dc61b75
 test/extractor-tests/generated/WhereClause/WhereClause.ql 89af4f9e3021560c67c49a3b7458449aeda469f586317d8855d00977a8969a95 59f9f9e7619fb0aa17124679c69723a31f03e7a7af24088b274234c034371e7c
 test/extractor-tests/generated/WhereClause/WhereClause_getPredicate.ql cc9f83e30aa028d0130c7f27a1cb72a2c8e3100d65de4041f24670e8062192a4 a561ef1d71efc850b73f30a695777acda4835e2b9a34b1d054a57ebb2450d73c
-test/extractor-tests/generated/WherePred/WherePred.ql 4955fa96838565a7cbfaa3361586632764cb67e52e1ca10d2951a924353d94f3 4bfcfe08c3482e0801214b4a06ed632ca02e163c5437ad94d370fc901eb23baf
+test/extractor-tests/generated/WherePred/WherePred.ql 3a29d0eae524810ade32546b9170f25cc243f8542b68b5fe86b0fd2d766e92b3 ff5742ad1d36f2675089c2692418e3c8e73cca3ed1e8796d795aa6c681107099
 test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.ql 21c3aaae697a7c8b4df82aa5c6eeef4963c9240fafb20cca3888e4361e208966 2f9ab4ed12984a4c82af2b8b805b28c2cb0c82d4e90927d9cf5be81e3bdc231a
 test/extractor-tests/generated/WherePred/WherePred_getLifetime.ql e08d9d6cccf634746f42a6ee583bbb3e7e9a9edbb63242e73b2bff4463df55d8 139543750c18f88d9c1ad2cdbcf1699d597cf2264bbb6b02a7e5792444e277ef
-test/extractor-tests/generated/WherePred/WherePred_getTy.ql 34cee0335bbaf8946fe15e3c32449150d07a730fcca56b4faed554fbb8689e21 883976c8c27c276c402d591ebd89d076c2c4d8da4d4f738f3c860c34d4a03b97
 test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.ql c78e31ff4d1822a6b76f403e5ccb8f5529b4f784e14e618833df0378adca55fc 8bb1c9b5a1cfca0f5e8335464f7439aa098063176fbd3edbaf3407169f1899e6
+test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql e56e4989bb9b9ff1d8648641993732dac2f37c5e3b4bbf1c550735a4f1d84b3c 246cd2cfaf90115060412c9e4a15da9089f3b524f72a63ae42d17b062e7be52f
 test/extractor-tests/generated/WhileExpr/WhileExpr.ql 61c49414f2ed786a68b79bd9a77093e4086457edb6c136cf8a94f2ac830c2f5b 7737f724a297d011c12143e009a63926812c63c08a1067b03e8677697ab00f83
 test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.ql f8527130eb2492743c0e629c97db291abcefe3d35302c840fee327ab0d8f10fd b41bedd429e5566fd68a50140ff1f50b51e2c7c351cbc8253fbc126527073f7e
 test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.ql 84a021806423425b24eaeb9fb9967a6aadabe823c24e77a0dfefcb3509041597 147aa8bbe4dbf9b90be2467db8207dc96aed281e722eb6b9c998442a90911a6c
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index f8cf236c7a53..34d2a4ab6815 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -7,7 +7,7 @@
 /lib/codeql/rust/elements/ArrayExpr.qll linguist-generated
 /lib/codeql/rust/elements/ArrayListExpr.qll linguist-generated
 /lib/codeql/rust/elements/ArrayRepeatExpr.qll linguist-generated
-/lib/codeql/rust/elements/ArrayType.qll linguist-generated
+/lib/codeql/rust/elements/ArrayTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/AsmExpr.qll linguist-generated
 /lib/codeql/rust/elements/AssocItem.qll linguist-generated
 /lib/codeql/rust/elements/AssocItemList.qll linguist-generated
@@ -32,7 +32,7 @@
 /lib/codeql/rust/elements/ConstBlockPat.qll linguist-generated
 /lib/codeql/rust/elements/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/ContinueExpr.qll linguist-generated
-/lib/codeql/rust/elements/DynTraitType.qll linguist-generated
+/lib/codeql/rust/elements/DynTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Element.qll linguist-generated
 /lib/codeql/rust/elements/Enum.qll linguist-generated
 /lib/codeql/rust/elements/Expr.qll linguist-generated
@@ -43,9 +43,9 @@
 /lib/codeql/rust/elements/ExternItemList.qll linguist-generated
 /lib/codeql/rust/elements/FieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/FieldList.qll linguist-generated
-/lib/codeql/rust/elements/FnPtrType.qll linguist-generated
+/lib/codeql/rust/elements/FnPtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/ForExpr.qll linguist-generated
-/lib/codeql/rust/elements/ForType.qll linguist-generated
+/lib/codeql/rust/elements/ForTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Format.qll linguist-generated
 /lib/codeql/rust/elements/FormatArgsArg.qll linguist-generated
 /lib/codeql/rust/elements/FormatArgsExpr.qll linguist-generated
@@ -59,9 +59,9 @@
 /lib/codeql/rust/elements/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/IfExpr.qll linguist-generated
 /lib/codeql/rust/elements/Impl.qll linguist-generated
-/lib/codeql/rust/elements/ImplTraitType.qll linguist-generated
+/lib/codeql/rust/elements/ImplTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/IndexExpr.qll linguist-generated
-/lib/codeql/rust/elements/InferType.qll linguist-generated
+/lib/codeql/rust/elements/InferTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Item.qll linguist-generated
 /lib/codeql/rust/elements/ItemList.qll linguist-generated
 /lib/codeql/rust/elements/Label.qll linguist-generated
@@ -84,7 +84,7 @@
 /lib/codeql/rust/elements/MacroPat.qll linguist-generated
 /lib/codeql/rust/elements/MacroRules.qll linguist-generated
 /lib/codeql/rust/elements/MacroStmts.qll linguist-generated
-/lib/codeql/rust/elements/MacroType.qll linguist-generated
+/lib/codeql/rust/elements/MacroTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/MatchArm.qll linguist-generated
 /lib/codeql/rust/elements/MatchArmList.qll linguist-generated
 /lib/codeql/rust/elements/MatchExpr.qll linguist-generated
@@ -95,7 +95,7 @@
 /lib/codeql/rust/elements/Module.qll linguist-generated
 /lib/codeql/rust/elements/Name.qll linguist-generated
 /lib/codeql/rust/elements/NameRef.qll linguist-generated
-/lib/codeql/rust/elements/NeverType.qll linguist-generated
+/lib/codeql/rust/elements/NeverTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/OrPat.qll linguist-generated
 /lib/codeql/rust/elements/Param.qll linguist-generated
@@ -103,16 +103,16 @@
 /lib/codeql/rust/elements/ParamList.qll linguist-generated
 /lib/codeql/rust/elements/ParenExpr.qll linguist-generated
 /lib/codeql/rust/elements/ParenPat.qll linguist-generated
-/lib/codeql/rust/elements/ParenType.qll linguist-generated
+/lib/codeql/rust/elements/ParenTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Pat.qll linguist-generated
 /lib/codeql/rust/elements/Path.qll linguist-generated
 /lib/codeql/rust/elements/PathExpr.qll linguist-generated
 /lib/codeql/rust/elements/PathExprBase.qll linguist-generated
 /lib/codeql/rust/elements/PathPat.qll linguist-generated
 /lib/codeql/rust/elements/PathSegment.qll linguist-generated
-/lib/codeql/rust/elements/PathType.qll linguist-generated
+/lib/codeql/rust/elements/PathTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/PrefixExpr.qll linguist-generated
-/lib/codeql/rust/elements/PtrType.qll linguist-generated
+/lib/codeql/rust/elements/PtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/RangePat.qll linguist-generated
 /lib/codeql/rust/elements/RecordExpr.qll linguist-generated
@@ -125,16 +125,16 @@
 /lib/codeql/rust/elements/RecordPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/RefExpr.qll linguist-generated
 /lib/codeql/rust/elements/RefPat.qll linguist-generated
-/lib/codeql/rust/elements/RefType.qll linguist-generated
+/lib/codeql/rust/elements/RefTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Rename.qll linguist-generated
 /lib/codeql/rust/elements/Resolvable.qll linguist-generated
 /lib/codeql/rust/elements/RestPat.qll linguist-generated
-/lib/codeql/rust/elements/RetType.qll linguist-generated
+/lib/codeql/rust/elements/RetTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/ReturnExpr.qll linguist-generated
 /lib/codeql/rust/elements/ReturnTypeSyntax.qll linguist-generated
 /lib/codeql/rust/elements/SelfParam.qll linguist-generated
 /lib/codeql/rust/elements/SlicePat.qll linguist-generated
-/lib/codeql/rust/elements/SliceType.qll linguist-generated
+/lib/codeql/rust/elements/SliceTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/SourceFile.qll linguist-generated
 /lib/codeql/rust/elements/Static.qll linguist-generated
 /lib/codeql/rust/elements/Stmt.qll linguist-generated
@@ -150,13 +150,13 @@
 /lib/codeql/rust/elements/TupleFieldList.qll linguist-generated
 /lib/codeql/rust/elements/TuplePat.qll linguist-generated
 /lib/codeql/rust/elements/TupleStructPat.qll linguist-generated
-/lib/codeql/rust/elements/TupleType.qll linguist-generated
+/lib/codeql/rust/elements/TupleTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/TypeAlias.qll linguist-generated
 /lib/codeql/rust/elements/TypeArg.qll linguist-generated
 /lib/codeql/rust/elements/TypeBound.qll linguist-generated
 /lib/codeql/rust/elements/TypeBoundList.qll linguist-generated
 /lib/codeql/rust/elements/TypeParam.qll linguist-generated
-/lib/codeql/rust/elements/TypeRef.qll linguist-generated
+/lib/codeql/rust/elements/TypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/elements/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/Unimplemented.qll linguist-generated
@@ -181,8 +181,8 @@
 /lib/codeql/rust/elements/internal/ArrayExprInternal.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArrayExprInternalConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArrayExprInternalImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AsmExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AsmExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AssocItemImpl.qll linguist-generated
@@ -215,8 +215,8 @@
 /lib/codeql/rust/elements/internal/ConstParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ContinueExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/EnumConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprStmtConstructor.qll linguist-generated
@@ -230,11 +230,11 @@
 /lib/codeql/rust/elements/internal/ExternItemListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FieldExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FieldListImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ForExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ForTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ForTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll linguist-generated
@@ -247,10 +247,10 @@
 /lib/codeql/rust/elements/internal/IdentPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ImplConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IndexExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/InferTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemListImpl.qll linguist-generated
@@ -280,8 +280,8 @@
 /lib/codeql/rust/elements/internal/MacroRulesImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroStmtsImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MacroTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmListImpl.qll linguist-generated
@@ -296,7 +296,7 @@
 /lib/codeql/rust/elements/internal/ModuleConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/NameConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/NameRefConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/OrPatConstructor.qll linguist-generated
@@ -305,17 +305,17 @@
 /lib/codeql/rust/elements/internal/ParamListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParenExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParenPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathExprBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathSegmentConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PathTypeConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PrefixExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PtrTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangeExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangePatImpl.qll linguist-generated
@@ -334,13 +334,13 @@
 /lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RefTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RefTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RefTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RenameConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RenameImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RestPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RetTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RetTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll linguist-generated
@@ -348,8 +348,8 @@
 /lib/codeql/rust/elements/internal/SelfParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/SlicePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/SlicePatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/SliceTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/SourceFileConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/SourceFileImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/StaticConstructor.qll linguist-generated
@@ -377,8 +377,8 @@
 /lib/codeql/rust/elements/internal/TuplePatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleStructPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleStructPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/TupleTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeAliasConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeAliasImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeArgConstructor.qll linguist-generated
@@ -389,7 +389,7 @@
 /lib/codeql/rust/elements/internal/TypeBoundListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeParamImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/TypeRefImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnextractedImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnimplementedConstructor.qll linguist-generated
@@ -424,7 +424,7 @@
 /lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArrayListExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArrayRepeatExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ArrayType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AsmExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AssocItem.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AssocItemList.qll linguist-generated
@@ -449,7 +449,7 @@
 /lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ContinueExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/DynTraitType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Element.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Enum.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Expr.qll linguist-generated
@@ -460,9 +460,9 @@
 /lib/codeql/rust/elements/internal/generated/ExternItemList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FieldList.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/FnPtrType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ForExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ForType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Format.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll linguist-generated
@@ -476,9 +476,9 @@
 /lib/codeql/rust/elements/internal/generated/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IfExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Impl.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IndexExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/InferType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Item.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ItemList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Label.qll linguist-generated
@@ -501,7 +501,7 @@
 /lib/codeql/rust/elements/internal/generated/MacroPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroRules.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroStmts.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/MacroType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArm.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArmList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchExpr.qll linguist-generated
@@ -512,7 +512,7 @@
 /lib/codeql/rust/elements/internal/generated/Module.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Name.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/NameRef.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/NeverType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OrPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Param.qll linguist-generated
@@ -520,7 +520,7 @@
 /lib/codeql/rust/elements/internal/generated/ParamList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParenExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParenPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ParenType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParentChild.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Pat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Path.qll linguist-generated
@@ -528,9 +528,9 @@
 /lib/codeql/rust/elements/internal/generated/PathExprBase.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathSegment.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/PathType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PrefixExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/PtrType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RangePat.qll linguist-generated
@@ -545,16 +545,16 @@
 /lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RefType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Rename.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Resolvable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RestPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RetType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ReturnExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SelfParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SlicePat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/SliceType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SourceFile.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Static.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Stmt.qll linguist-generated
@@ -572,13 +572,13 @@
 /lib/codeql/rust/elements/internal/generated/TupleFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TuplePat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TupleStructPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/TupleType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeAlias.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeBound.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeBoundList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeParam.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/TypeRef.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Unimplemented.qll linguist-generated
@@ -606,9 +606,9 @@
 /test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql linguist-generated
 /test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/ArrayType/ArrayType.ql linguist-generated
-/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql linguist-generated
-/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql linguist-generated
+/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql linguist-generated
+/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/AsmExpr/AsmExpr.ql linguist-generated
 /test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql linguist-generated
@@ -619,8 +619,8 @@
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.ql linguist-generated
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.ql linguist-generated
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.ql linguist-generated
-/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql linguist-generated
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Attr/Attr.ql linguist-generated
 /test/extractor-tests/generated/Attr/Attr_getMeta.ql linguist-generated
 /test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql linguist-generated
@@ -651,7 +651,7 @@
 /test/extractor-tests/generated/CastExpr/CastExpr.ql linguist-generated
 /test/extractor-tests/generated/CastExpr/CastExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql linguist-generated
+/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql linguist-generated
 /test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql linguist-generated
@@ -667,7 +667,7 @@
 /test/extractor-tests/generated/Const/Const_getCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getName.ql linguist-generated
-/test/extractor-tests/generated/Const/Const_getTy.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/ConstArg/ConstArg.ql linguist-generated
 /test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql linguist-generated
@@ -677,12 +677,12 @@
 /test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql linguist-generated
 /test/extractor-tests/generated/ConstParam/ConstParam_getName.ql linguist-generated
-/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql linguist-generated
+/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql linguist-generated
 /test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql linguist-generated
-/test/extractor-tests/generated/DynTraitType/DynTraitType.ql linguist-generated
-/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum_getAttr.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql linguist-generated
@@ -714,19 +714,19 @@
 /test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql linguist-generated
-/test/extractor-tests/generated/FnPtrType/FnPtrType.ql linguist-generated
-/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql linguist-generated
-/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql linguist-generated
-/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql linguist-generated
+/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql linguist-generated
+/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql linguist-generated
+/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getIterable.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getLabel.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getPat.ql linguist-generated
-/test/extractor-tests/generated/ForType/ForType.ql linguist-generated
-/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql linguist-generated
-/test/extractor-tests/generated/ForType/ForType_getTy.ql linguist-generated
+/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/FormatArgsExpr/Format.ql linguist-generated
 /test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql linguist-generated
 /test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.ql linguist-generated
@@ -775,13 +775,13 @@
 /test/extractor-tests/generated/Impl/Impl_getTrait.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getWhereClause.ql linguist-generated
-/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql linguist-generated
-/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.ql linguist-generated
-/test/extractor-tests/generated/InferType/InferType.ql linguist-generated
+/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ItemList/ItemList.ql linguist-generated
 /test/extractor-tests/generated/ItemList/ItemList_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ItemList/ItemList_getItem.ql linguist-generated
@@ -798,7 +798,7 @@
 /test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt_getPat.ql linguist-generated
-/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql linguist-generated
+/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Lifetime/Lifetime.ql linguist-generated
 /test/extractor-tests/generated/Lifetime/Lifetime_getText.ql linguist-generated
 /test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql linguist-generated
@@ -847,8 +847,8 @@
 /test/extractor-tests/generated/MacroStmts/MacroStmts.ql linguist-generated
 /test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql linguist-generated
 /test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql linguist-generated
-/test/extractor-tests/generated/MacroType/MacroType.ql linguist-generated
-/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql linguist-generated
+/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm_getAttr.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm_getExpr.ql linguist-generated
@@ -886,17 +886,17 @@
 /test/extractor-tests/generated/Name/Name_getText.ql linguist-generated
 /test/extractor-tests/generated/NameRef/NameRef.ql linguist-generated
 /test/extractor-tests/generated/NameRef/NameRef_getText.ql linguist-generated
-/test/extractor-tests/generated/NeverType/NeverType.ql linguist-generated
+/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql linguist-generated
 /test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql linguist-generated
-/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql linguist-generated
+/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/OrPat/OrPat.ql linguist-generated
 /test/extractor-tests/generated/OrPat/OrPat_getPat.ql linguist-generated
 /test/extractor-tests/generated/Param/Param.ql linguist-generated
 /test/extractor-tests/generated/Param/Param_getAttr.ql linguist-generated
 /test/extractor-tests/generated/Param/Param_getPat.ql linguist-generated
-/test/extractor-tests/generated/Param/Param_getTy.ql linguist-generated
+/test/extractor-tests/generated/Param/Param_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ParamList/ParamList.ql linguist-generated
 /test/extractor-tests/generated/ParamList/ParamList_getParam.ql linguist-generated
 /test/extractor-tests/generated/ParamList/ParamList_getSelfParam.ql linguist-generated
@@ -905,8 +905,8 @@
 /test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/ParenPat/ParenPat.ql linguist-generated
 /test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql linguist-generated
-/test/extractor-tests/generated/ParenType/ParenType.ql linguist-generated
-/test/extractor-tests/generated/ParenType/ParenType_getTy.ql linguist-generated
+/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Path/Path.ql linguist-generated
 /test/extractor-tests/generated/Path/PathExpr.ql linguist-generated
 /test/extractor-tests/generated/Path/PathExpr_getAttr.ql linguist-generated
@@ -920,9 +920,9 @@
 /test/extractor-tests/generated/Path/PathSegment_getPathType.ql linguist-generated
 /test/extractor-tests/generated/Path/PathSegment_getRetType.ql linguist-generated
 /test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.ql linguist-generated
-/test/extractor-tests/generated/Path/PathSegment_getTy.ql linguist-generated
-/test/extractor-tests/generated/Path/PathType.ql linguist-generated
-/test/extractor-tests/generated/Path/PathType_getPath.ql linguist-generated
+/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/Path/PathTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql linguist-generated
 /test/extractor-tests/generated/Path/Path_getPart.ql linguist-generated
 /test/extractor-tests/generated/Path/Path_getQualifier.ql linguist-generated
 /test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.ql linguist-generated
@@ -931,8 +931,8 @@
 /test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql linguist-generated
-/test/extractor-tests/generated/PtrType/PtrType.ql linguist-generated
-/test/extractor-tests/generated/PtrType/PtrType_getTy.ql linguist-generated
+/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/RangeExpr/RangeExpr.ql linguist-generated
 /test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.ql linguist-generated
@@ -956,7 +956,7 @@
 /test/extractor-tests/generated/RecordField/RecordField.ql linguist-generated
 /test/extractor-tests/generated/RecordField/RecordField_getAttr.ql linguist-generated
 /test/extractor-tests/generated/RecordField/RecordField_getName.ql linguist-generated
-/test/extractor-tests/generated/RecordField/RecordField_getTy.ql linguist-generated
+/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql linguist-generated
 /test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql linguist-generated
@@ -975,15 +975,15 @@
 /test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/RefPat/RefPat.ql linguist-generated
 /test/extractor-tests/generated/RefPat/RefPat_getPat.ql linguist-generated
-/test/extractor-tests/generated/RefType/RefType.ql linguist-generated
-/test/extractor-tests/generated/RefType/RefType_getLifetime.ql linguist-generated
-/test/extractor-tests/generated/RefType/RefType_getTy.ql linguist-generated
+/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Rename/Rename.ql linguist-generated
 /test/extractor-tests/generated/Rename/Rename_getName.ql linguist-generated
 /test/extractor-tests/generated/RestPat/RestPat.ql linguist-generated
 /test/extractor-tests/generated/RestPat/RestPat_getAttr.ql linguist-generated
-/test/extractor-tests/generated/RetType/RetType.ql linguist-generated
-/test/extractor-tests/generated/RetType/RetType_getTy.ql linguist-generated
+/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql linguist-generated
 /test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql linguist-generated
@@ -992,11 +992,11 @@
 /test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql linguist-generated
 /test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql linguist-generated
 /test/extractor-tests/generated/SelfParam/SelfParam_getName.ql linguist-generated
-/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql linguist-generated
+/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/SlicePat/SlicePat.ql linguist-generated
 /test/extractor-tests/generated/SlicePat/SlicePat_getPat.ql linguist-generated
-/test/extractor-tests/generated/SliceType/SliceType.ql linguist-generated
-/test/extractor-tests/generated/SliceType/SliceType_getTy.ql linguist-generated
+/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/SourceFile/SourceFile.ql linguist-generated
 /test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql linguist-generated
 /test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql linguist-generated
@@ -1006,7 +1006,7 @@
 /test/extractor-tests/generated/Static/Static_getCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getName.ql linguist-generated
-/test/extractor-tests/generated/Static/Static_getTy.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/StmtList/StmtList.ql linguist-generated
 /test/extractor-tests/generated/StmtList/StmtList_getAttr.ql linguist-generated
@@ -1052,7 +1052,7 @@
 /test/extractor-tests/generated/TupleExpr/TupleExpr_getField.ql linguist-generated
 /test/extractor-tests/generated/TupleField/TupleField.ql linguist-generated
 /test/extractor-tests/generated/TupleField/TupleField_getAttr.ql linguist-generated
-/test/extractor-tests/generated/TupleField/TupleField_getTy.ql linguist-generated
+/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/TupleField/TupleField_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql linguist-generated
 /test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql linguist-generated
@@ -1061,24 +1061,24 @@
 /test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql linguist-generated
 /test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql linguist-generated
 /test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql linguist-generated
-/test/extractor-tests/generated/TupleType/TupleType.ql linguist-generated
-/test/extractor-tests/generated/TupleType/TupleType_getField.ql linguist-generated
+/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql linguist-generated
-/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql linguist-generated
 /test/extractor-tests/generated/TypeArg/TypeArg.ql linguist-generated
-/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql linguist-generated
+/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/TypeBound/TypeBound.ql linguist-generated
 /test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql linguist-generated
-/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql linguist-generated
+/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.ql linguist-generated
 /test/extractor-tests/generated/TypeParam/TypeParam.ql linguist-generated
@@ -1126,8 +1126,8 @@
 /test/extractor-tests/generated/WherePred/WherePred.ql linguist-generated
 /test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/WherePred/WherePred_getLifetime.ql linguist-generated
-/test/extractor-tests/generated/WherePred/WherePred_getTy.ql linguist-generated
 /test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/WhileExpr/WhileExpr.ql linguist-generated
 /test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.ql linguist-generated
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 0b78b44f1803..b999c5c78488 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -198,7 +198,7 @@ class SelfParamTree extends StandardPostOrderTree, SelfParam {
   override AstNode getChildNode(int i) { i = 0 and result = this.getName() }
 }
 
-class TypeRefTree extends LeafTree instanceof TypeRef { }
+class TypeReprTree extends LeafTree instanceof TypeRepr { }
 
 /**
  * Provides `ControlFlowTree`s for expressions.
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
index 99cf29a5e98a..b28dd64d66e8 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
@@ -533,7 +533,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       BoxPat getBoxPat() { result = node }
 
       /**
-       * Gets the pat of this box pat, if it exists.
+       * Gets the pattern of this box pattern, if it exists.
        */
       PatCfgNode getPat() {
         any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
@@ -729,7 +729,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       ConstBlockPat getConstBlockPat() { result = node }
 
       /**
-       * Gets the block expression of this const block pat, if it exists.
+       * Gets the block expression of this const block pattern, if it exists.
        */
       BlockExprCfgNode getBlockExpr() {
         any(ChildMapping mapping).hasCfgChild(node, node.getBlockExpr(), this, result)
@@ -741,7 +741,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasBlockExpr() { exists(this.getBlockExpr()) }
 
       /**
-       * Holds if this const block pat is const.
+       * Holds if this const block pattern is const.
        */
       predicate isConst() { node.isConst() }
     }
@@ -929,7 +929,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasIterable() { exists(this.getIterable()) }
 
       /**
-       * Gets the pat of this for expression, if it exists.
+       * Gets the pattern of this for expression, if it exists.
        */
       PatCfgNode getPat() {
         any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
@@ -1074,32 +1074,32 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       IdentPat getIdentPat() { result = node }
 
       /**
-       * Gets the `index`th attr of this ident pat (0-based).
+       * Gets the `index`th attr of this ident pattern (0-based).
        */
       Attr getAttr(int index) { result = node.getAttr(index) }
 
       /**
-       * Gets any of the attrs of this ident pat.
+       * Gets any of the attrs of this ident pattern.
        */
       Attr getAnAttr() { result = this.getAttr(_) }
 
       /**
-       * Gets the number of attrs of this ident pat.
+       * Gets the number of attrs of this ident pattern.
        */
       int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
       /**
-       * Holds if this ident pat is mut.
+       * Holds if this ident pattern is mut.
        */
       predicate isMut() { node.isMut() }
 
       /**
-       * Holds if this ident pat is reference.
+       * Holds if this ident pattern is reference.
        */
       predicate isRef() { node.isRef() }
 
       /**
-       * Gets the name of this ident pat, if it exists.
+       * Gets the name of this ident pattern, if it exists.
        */
       Name getName() { result = node.getName() }
 
@@ -1109,7 +1109,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasName() { exists(this.getName()) }
 
       /**
-       * Gets the pat of this ident pat, if it exists.
+       * Gets the pattern of this ident pattern, if it exists.
        */
       PatCfgNode getPat() {
         any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
@@ -1353,7 +1353,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasScrutinee() { exists(this.getScrutinee()) }
 
       /**
-       * Gets the pat of this let expression, if it exists.
+       * Gets the pattern of this let expression, if it exists.
        */
       PatCfgNode getPat() {
         any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
@@ -1434,7 +1434,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasLetElse() { exists(this.getLetElse()) }
 
       /**
-       * Gets the pat of this let statement, if it exists.
+       * Gets the pattern of this let statement, if it exists.
        */
       PatCfgNode getPat() {
         any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
@@ -1446,14 +1446,14 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasPat() { exists(this.getPat()) }
 
       /**
-       * Gets the ty of this let statement, if it exists.
+       * Gets the type representation of this let statement, if it exists.
        */
-      TypeRef getTy() { result = node.getTy() }
+      TypeRepr getTypeRepr() { result = node.getTypeRepr() }
 
       /**
-       * Holds if `getTy()` exists.
+       * Holds if `getTypeRepr()` exists.
        */
-      predicate hasTy() { exists(this.getTy()) }
+      predicate hasTypeRepr() { exists(this.getTypeRepr()) }
     }
 
     final private class ParentLiteralExpr extends ParentAstNode, LiteralExpr {
@@ -1533,7 +1533,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       LiteralPat getLiteralPat() { result = node }
 
       /**
-       * Gets the literal of this literal pat, if it exists.
+       * Gets the literal of this literal pattern, if it exists.
        */
       LiteralExprCfgNode getLiteral() {
         any(ChildMapping mapping).hasCfgChild(node, node.getLiteral(), this, result)
@@ -1751,7 +1751,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       MacroPat getMacroPat() { result = node }
 
       /**
-       * Gets the macro call of this macro pat, if it exists.
+       * Gets the macro call of this macro pattern, if it exists.
        */
       MacroCallCfgNode getMacroCall() {
         any(ChildMapping mapping).hasCfgChild(node, node.getMacroCall(), this, result)
@@ -1937,14 +1937,14 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
 
       /**
-       * Gets the ty of this offset of expression, if it exists.
+       * Gets the type representation of this offset of expression, if it exists.
        */
-      TypeRef getTy() { result = node.getTy() }
+      TypeRepr getTypeRepr() { result = node.getTypeRepr() }
 
       /**
-       * Holds if `getTy()` exists.
+       * Holds if `getTypeRepr()` exists.
        */
-      predicate hasTy() { exists(this.getTy()) }
+      predicate hasTypeRepr() { exists(this.getTypeRepr()) }
     }
 
     final private class ParentOrPat extends ParentAstNode, OrPat {
@@ -1972,19 +1972,19 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       OrPat getOrPat() { result = node }
 
       /**
-       * Gets the `index`th pat of this or pat (0-based).
+       * Gets the `index`th pattern of this or pattern (0-based).
        */
       PatCfgNode getPat(int index) {
         any(ChildMapping mapping).hasCfgChild(node, node.getPat(index), this, result)
       }
 
       /**
-       * Gets any of the pats of this or pat.
+       * Gets any of the patterns of this or pattern.
        */
       PatCfgNode getAPat() { result = this.getPat(_) }
 
       /**
-       * Gets the number of pats of this or pat.
+       * Gets the number of patterns of this or pattern.
        */
       int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
     }
@@ -2014,7 +2014,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       Param getParam() { result = node }
 
       /**
-       * Gets the pat of this parameter, if it exists.
+       * Gets the pattern of this parameter, if it exists.
        */
       PatCfgNode getPat() {
         any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
@@ -2057,14 +2057,14 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
       /**
-       * Gets the ty of this parameter base, if it exists.
+       * Gets the type representation of this parameter base, if it exists.
        */
-      TypeRef getTy() { result = node.getTy() }
+      TypeRepr getTypeRepr() { result = node.getTypeRepr() }
 
       /**
-       * Holds if `getTy()` exists.
+       * Holds if `getTypeRepr()` exists.
        */
-      predicate hasTy() { exists(this.getTy()) }
+      predicate hasTypeRepr() { exists(this.getTypeRepr()) }
     }
 
     final private class ParentPat extends ParentAstNode, Pat {
@@ -2093,7 +2093,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
      * let x = variable;
      * let x = foo::bar;
      * let y = <T>::foo;
-     * let z = <TypeRef as Trait>::foo;
+     * let z = <TypeRepr as Trait>::foo;
      * ```
      */
     final class PathExprCfgNode extends CfgNodeFinal, PathExprBaseCfgNode {
@@ -2168,7 +2168,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       PathPat getPathPat() { result = node }
 
       /**
-       * Gets the path of this path pat, if it exists.
+       * Gets the path of this path pattern, if it exists.
        */
       Path getPath() { result = node.getPath() }
 
@@ -2348,7 +2348,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       RangePat getRangePat() { result = node }
 
       /**
-       * Gets the end of this range pat, if it exists.
+       * Gets the end of this range pattern, if it exists.
        */
       PatCfgNode getEnd() {
         any(ChildMapping mapping).hasCfgChild(node, node.getEnd(), this, result)
@@ -2360,7 +2360,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasEnd() { exists(this.getEnd()) }
 
       /**
-       * Gets the operator name of this range pat, if it exists.
+       * Gets the operator name of this range pattern, if it exists.
        */
       string getOperatorName() { result = node.getOperatorName() }
 
@@ -2370,7 +2370,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasOperatorName() { exists(this.getOperatorName()) }
 
       /**
-       * Gets the start of this range pat, if it exists.
+       * Gets the start of this range pattern, if it exists.
        */
       PatCfgNode getStart() {
         any(ChildMapping mapping).hasCfgChild(node, node.getStart(), this, result)
@@ -2446,7 +2446,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       RecordPat getRecordPat() { result = node }
 
       /**
-       * Gets the path of this record pat, if it exists.
+       * Gets the path of this record pattern, if it exists.
        */
       Path getPath() { result = node.getPath() }
 
@@ -2456,7 +2456,7 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       predicate hasPath() { exists(this.getPath()) }
 
       /**
-       * Gets the record pat field list of this record pat, if it exists.
+       * Gets the record pattern field list of this record pattern, if it exists.
        */
       RecordPatFieldList getRecordPatFieldList() { result = node.getRecordPatFieldList() }
 
@@ -2560,12 +2560,12 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       RefPat getRefPat() { result = node }
 
       /**
-       * Holds if this reference pat is mut.
+       * Holds if this reference pattern is mut.
        */
       predicate isMut() { node.isMut() }
 
       /**
-       * Gets the pat of this reference pat, if it exists.
+       * Gets the pattern of this reference pattern, if it exists.
        */
       PatCfgNode getPat() {
         any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
@@ -2596,17 +2596,17 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       RestPat getRestPat() { result = node }
 
       /**
-       * Gets the `index`th attr of this rest pat (0-based).
+       * Gets the `index`th attr of this rest pattern (0-based).
        */
       Attr getAttr(int index) { result = node.getAttr(index) }
 
       /**
-       * Gets any of the attrs of this rest pat.
+       * Gets any of the attrs of this rest pattern.
        */
       Attr getAnAttr() { result = this.getAttr(_) }
 
       /**
-       * Gets the number of attrs of this rest pat.
+       * Gets the number of attrs of this rest pattern.
        */
       int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
     }
@@ -2741,19 +2741,19 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       SlicePat getSlicePat() { result = node }
 
       /**
-       * Gets the `index`th pat of this slice pat (0-based).
+       * Gets the `index`th pattern of this slice pattern (0-based).
        */
       PatCfgNode getPat(int index) {
         any(ChildMapping mapping).hasCfgChild(node, node.getPat(index), this, result)
       }
 
       /**
-       * Gets any of the pats of this slice pat.
+       * Gets any of the patterns of this slice pattern.
        */
       PatCfgNode getAPat() { result = this.getPat(_) }
 
       /**
-       * Gets the number of pats of this slice pat.
+       * Gets the number of patterns of this slice pattern.
        */
       int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
     }
@@ -2888,19 +2888,19 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       TuplePat getTuplePat() { result = node }
 
       /**
-       * Gets the `index`th field of this tuple pat (0-based).
+       * Gets the `index`th field of this tuple pattern (0-based).
        */
       PatCfgNode getField(int index) {
         any(ChildMapping mapping).hasCfgChild(node, node.getField(index), this, result)
       }
 
       /**
-       * Gets any of the fields of this tuple pat.
+       * Gets any of the fields of this tuple pattern.
        */
       PatCfgNode getAField() { result = this.getField(_) }
 
       /**
-       * Gets the number of fields of this tuple pat.
+       * Gets the number of fields of this tuple pattern.
        */
       int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
     }
@@ -2932,24 +2932,24 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       TupleStructPat getTupleStructPat() { result = node }
 
       /**
-       * Gets the `index`th field of this tuple struct pat (0-based).
+       * Gets the `index`th field of this tuple struct pattern (0-based).
        */
       PatCfgNode getField(int index) {
         any(ChildMapping mapping).hasCfgChild(node, node.getField(index), this, result)
       }
 
       /**
-       * Gets any of the fields of this tuple struct pat.
+       * Gets any of the fields of this tuple struct pattern.
        */
       PatCfgNode getAField() { result = this.getField(_) }
 
       /**
-       * Gets the number of fields of this tuple struct pat.
+       * Gets the number of fields of this tuple struct pattern.
        */
       int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
 
       /**
-       * Gets the path of this tuple struct pat, if it exists.
+       * Gets the path of this tuple struct pattern, if it exists.
        */
       Path getPath() { result = node.getPath() }
 
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index 44d6291e20ad..de9ecf34467c 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -9,7 +9,7 @@ import codeql.rust.elements.ArgList
 import codeql.rust.elements.ArrayExpr
 import codeql.rust.elements.ArrayListExpr
 import codeql.rust.elements.ArrayRepeatExpr
-import codeql.rust.elements.ArrayType
+import codeql.rust.elements.ArrayTypeRepr
 import codeql.rust.elements.AsmExpr
 import codeql.rust.elements.AssocItem
 import codeql.rust.elements.AssocItemList
@@ -34,7 +34,7 @@ import codeql.rust.elements.ConstArg
 import codeql.rust.elements.ConstBlockPat
 import codeql.rust.elements.ConstParam
 import codeql.rust.elements.ContinueExpr
-import codeql.rust.elements.DynTraitType
+import codeql.rust.elements.DynTraitTypeRepr
 import codeql.rust.elements.Element
 import codeql.rust.elements.Enum
 import codeql.rust.elements.Expr
@@ -45,9 +45,9 @@ import codeql.rust.elements.ExternItem
 import codeql.rust.elements.ExternItemList
 import codeql.rust.elements.FieldExpr
 import codeql.rust.elements.FieldList
-import codeql.rust.elements.FnPtrType
+import codeql.rust.elements.FnPtrTypeRepr
 import codeql.rust.elements.ForExpr
-import codeql.rust.elements.ForType
+import codeql.rust.elements.ForTypeRepr
 import codeql.rust.elements.Format
 import codeql.rust.elements.FormatArgsArg
 import codeql.rust.elements.FormatArgsExpr
@@ -61,9 +61,9 @@ import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.IdentPat
 import codeql.rust.elements.IfExpr
 import codeql.rust.elements.Impl
-import codeql.rust.elements.ImplTraitType
+import codeql.rust.elements.ImplTraitTypeRepr
 import codeql.rust.elements.IndexExpr
-import codeql.rust.elements.InferType
+import codeql.rust.elements.InferTypeRepr
 import codeql.rust.elements.Item
 import codeql.rust.elements.ItemList
 import codeql.rust.elements.Label
@@ -86,7 +86,7 @@ import codeql.rust.elements.MacroItems
 import codeql.rust.elements.MacroPat
 import codeql.rust.elements.MacroRules
 import codeql.rust.elements.MacroStmts
-import codeql.rust.elements.MacroType
+import codeql.rust.elements.MacroTypeRepr
 import codeql.rust.elements.MatchArm
 import codeql.rust.elements.MatchArmList
 import codeql.rust.elements.MatchExpr
@@ -97,7 +97,7 @@ import codeql.rust.elements.Missing
 import codeql.rust.elements.Module
 import codeql.rust.elements.Name
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.NeverType
+import codeql.rust.elements.NeverTypeRepr
 import codeql.rust.elements.OffsetOfExpr
 import codeql.rust.elements.OrPat
 import codeql.rust.elements.Param
@@ -105,16 +105,16 @@ import codeql.rust.elements.ParamBase
 import codeql.rust.elements.ParamList
 import codeql.rust.elements.ParenExpr
 import codeql.rust.elements.ParenPat
-import codeql.rust.elements.ParenType
+import codeql.rust.elements.ParenTypeRepr
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
 import codeql.rust.elements.PathExpr
 import codeql.rust.elements.PathExprBase
 import codeql.rust.elements.PathPat
 import codeql.rust.elements.PathSegment
-import codeql.rust.elements.PathType
+import codeql.rust.elements.PathTypeRepr
 import codeql.rust.elements.PrefixExpr
-import codeql.rust.elements.PtrType
+import codeql.rust.elements.PtrTypeRepr
 import codeql.rust.elements.RangeExpr
 import codeql.rust.elements.RangePat
 import codeql.rust.elements.RecordExpr
@@ -127,16 +127,16 @@ import codeql.rust.elements.RecordPatField
 import codeql.rust.elements.RecordPatFieldList
 import codeql.rust.elements.RefExpr
 import codeql.rust.elements.RefPat
-import codeql.rust.elements.RefType
+import codeql.rust.elements.RefTypeRepr
 import codeql.rust.elements.Rename
 import codeql.rust.elements.Resolvable
 import codeql.rust.elements.RestPat
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnExpr
 import codeql.rust.elements.ReturnTypeSyntax
 import codeql.rust.elements.SelfParam
 import codeql.rust.elements.SlicePat
-import codeql.rust.elements.SliceType
+import codeql.rust.elements.SliceTypeRepr
 import codeql.rust.elements.SourceFile
 import codeql.rust.elements.Static
 import codeql.rust.elements.Stmt
@@ -152,13 +152,13 @@ import codeql.rust.elements.TupleField
 import codeql.rust.elements.TupleFieldList
 import codeql.rust.elements.TuplePat
 import codeql.rust.elements.TupleStructPat
-import codeql.rust.elements.TupleType
+import codeql.rust.elements.TupleTypeRepr
 import codeql.rust.elements.TypeAlias
 import codeql.rust.elements.TypeArg
 import codeql.rust.elements.TypeBound
 import codeql.rust.elements.TypeBoundList
 import codeql.rust.elements.TypeParam
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.UnderscoreExpr
 import codeql.rust.elements.Unextracted
 import codeql.rust.elements.Unimplemented
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayType.qll b/rust/ql/lib/codeql/rust/elements/ArrayType.qll
deleted file mode 100644
index 85054d113298..000000000000
--- a/rust/ql/lib/codeql/rust/elements/ArrayType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ArrayType`.
- */
-
-private import internal.ArrayTypeImpl
-import codeql.rust.elements.ConstArg
-import codeql.rust.elements.TypeRef
-
-/**
- * A ArrayType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class ArrayType = Impl::ArrayType;
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ArrayTypeRepr.qll
new file mode 100644
index 000000000000..f1d2b20a8e09
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ArrayTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ArrayTypeRepr`.
+ */
+
+private import internal.ArrayTypeReprImpl
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A ArrayTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ArrayTypeRepr = Impl::ArrayTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll b/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
index bd8f6aca76d7..eded63ad7cc3 100644
--- a/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
@@ -9,10 +9,10 @@ import codeql.rust.elements.GenericArg
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.ParamList
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnTypeSyntax
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A AssocTypeArg. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
index 8dfbcfc2e4f0..f7a892e73992 100644
--- a/rust/ql/lib/codeql/rust/elements/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
@@ -6,7 +6,7 @@
 private import internal.CastExprImpl
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A cast expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
index cfcf18e48b24..d1f73bfaadbd 100644
--- a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
@@ -7,7 +7,7 @@ private import internal.ClosureExprImpl
 import codeql.rust.elements.Callable
 import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 
 /**
  * A closure expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/Const.qll b/rust/ql/lib/codeql/rust/elements/Const.qll
index c069f1ae56cd..12fde1ef28b7 100644
--- a/rust/ql/lib/codeql/rust/elements/Const.qll
+++ b/rust/ql/lib/codeql/rust/elements/Const.qll
@@ -9,7 +9,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
index 625e603cb8a0..ad7ff707272c 100644
--- a/rust/ql/lib/codeql/rust/elements/ConstParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.ConstArg
 import codeql.rust.elements.GenericParam
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A ConstParam. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/DynTraitType.qll b/rust/ql/lib/codeql/rust/elements/DynTraitType.qll
deleted file mode 100644
index 237e7d4704a3..000000000000
--- a/rust/ql/lib/codeql/rust/elements/DynTraitType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `DynTraitType`.
- */
-
-private import internal.DynTraitTypeImpl
-import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
-
-/**
- * A DynTraitType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class DynTraitType = Impl::DynTraitType;
diff --git a/rust/ql/lib/codeql/rust/elements/DynTraitTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/DynTraitTypeRepr.qll
new file mode 100644
index 000000000000..0ddf36aced65
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/DynTraitTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `DynTraitTypeRepr`.
+ */
+
+private import internal.DynTraitTypeReprImpl
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A DynTraitTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class DynTraitTypeRepr = Impl::DynTraitTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/FnPtrType.qll b/rust/ql/lib/codeql/rust/elements/FnPtrType.qll
deleted file mode 100644
index e0ed6490b5f0..000000000000
--- a/rust/ql/lib/codeql/rust/elements/FnPtrType.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `FnPtrType`.
- */
-
-private import internal.FnPtrTypeImpl
-import codeql.rust.elements.Abi
-import codeql.rust.elements.ParamList
-import codeql.rust.elements.RetType
-import codeql.rust.elements.TypeRef
-
-/**
- * A FnPtrType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class FnPtrType = Impl::FnPtrType;
diff --git a/rust/ql/lib/codeql/rust/elements/FnPtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/FnPtrTypeRepr.qll
new file mode 100644
index 000000000000..290b9b9d8fd2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FnPtrTypeRepr.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FnPtrTypeRepr`.
+ */
+
+private import internal.FnPtrTypeReprImpl
+import codeql.rust.elements.Abi
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetTypeRepr
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A FnPtrTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class FnPtrTypeRepr = Impl::FnPtrTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/ForType.qll b/rust/ql/lib/codeql/rust/elements/ForType.qll
deleted file mode 100644
index ec6bae3ab95a..000000000000
--- a/rust/ql/lib/codeql/rust/elements/ForType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ForType`.
- */
-
-private import internal.ForTypeImpl
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.TypeRef
-
-/**
- * A ForType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class ForType = Impl::ForType;
diff --git a/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
new file mode 100644
index 000000000000..d734fdd82539
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ForTypeRepr`.
+ */
+
+private import internal.ForTypeReprImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A ForTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ForTypeRepr = Impl::ForTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/Function.qll b/rust/ql/lib/codeql/rust/elements/Function.qll
index 2557429f60fa..2f2a151f453d 100644
--- a/rust/ql/lib/codeql/rust/elements/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/Function.qll
@@ -12,7 +12,7 @@ import codeql.rust.elements.ExternItem
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
diff --git a/rust/ql/lib/codeql/rust/elements/Impl.qll b/rust/ql/lib/codeql/rust/elements/Impl.qll
index 747cbe90cc67..868f5b6f2011 100644
--- a/rust/ql/lib/codeql/rust/elements/Impl.qll
+++ b/rust/ql/lib/codeql/rust/elements/Impl.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.AssocItemList
 import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
diff --git a/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll b/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll
deleted file mode 100644
index 7f3a8a961597..000000000000
--- a/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ImplTraitType`.
- */
-
-private import internal.ImplTraitTypeImpl
-import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
-
-/**
- * A ImplTraitType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class ImplTraitType = Impl::ImplTraitType;
diff --git a/rust/ql/lib/codeql/rust/elements/ImplTraitTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ImplTraitTypeRepr.qll
new file mode 100644
index 000000000000..72aa3048363d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ImplTraitTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ImplTraitTypeRepr`.
+ */
+
+private import internal.ImplTraitTypeReprImpl
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A ImplTraitTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ImplTraitTypeRepr = Impl::ImplTraitTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/InferType.qll b/rust/ql/lib/codeql/rust/elements/InferType.qll
deleted file mode 100644
index ae0f6eff7d55..000000000000
--- a/rust/ql/lib/codeql/rust/elements/InferType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `InferType`.
- */
-
-private import internal.InferTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A InferType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class InferType = Impl::InferType;
diff --git a/rust/ql/lib/codeql/rust/elements/InferTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/InferTypeRepr.qll
new file mode 100644
index 000000000000..79ff4934a562
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/InferTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `InferTypeRepr`.
+ */
+
+private import internal.InferTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A InferTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class InferTypeRepr = Impl::InferTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
index 63bf60e3e6f7..48960e3a5c60 100644
--- a/rust/ql/lib/codeql/rust/elements/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
@@ -9,7 +9,7 @@ import codeql.rust.elements.Expr
 import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Stmt
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A let statement. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/MacroType.qll b/rust/ql/lib/codeql/rust/elements/MacroType.qll
deleted file mode 100644
index 38be0fa4a20f..000000000000
--- a/rust/ql/lib/codeql/rust/elements/MacroType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `MacroType`.
- */
-
-private import internal.MacroTypeImpl
-import codeql.rust.elements.MacroCall
-import codeql.rust.elements.TypeRef
-
-/**
- * A MacroType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class MacroType = Impl::MacroType;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/MacroTypeRepr.qll
new file mode 100644
index 000000000000..780fb3d709cf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroTypeRepr`.
+ */
+
+private import internal.MacroTypeReprImpl
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A MacroTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MacroTypeRepr = Impl::MacroTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/NeverType.qll b/rust/ql/lib/codeql/rust/elements/NeverType.qll
deleted file mode 100644
index 3c46acd33ca2..000000000000
--- a/rust/ql/lib/codeql/rust/elements/NeverType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `NeverType`.
- */
-
-private import internal.NeverTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A NeverType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class NeverType = Impl::NeverType;
diff --git a/rust/ql/lib/codeql/rust/elements/NeverTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/NeverTypeRepr.qll
new file mode 100644
index 000000000000..8eec61da0589
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/NeverTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `NeverTypeRepr`.
+ */
+
+private import internal.NeverTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A NeverTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class NeverTypeRepr = Impl::NeverTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
index 3cd31677a690..4136158913a4 100644
--- a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
@@ -7,7 +7,7 @@ private import internal.OffsetOfExprImpl
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  *  An `offset_of` expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/ParamBase.qll b/rust/ql/lib/codeql/rust/elements/ParamBase.qll
index d3a031f4da5b..ca46906a14fe 100644
--- a/rust/ql/lib/codeql/rust/elements/ParamBase.qll
+++ b/rust/ql/lib/codeql/rust/elements/ParamBase.qll
@@ -6,7 +6,7 @@
 private import internal.ParamBaseImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A normal parameter, `Param`, or a self parameter `SelfParam`.
diff --git a/rust/ql/lib/codeql/rust/elements/ParenType.qll b/rust/ql/lib/codeql/rust/elements/ParenType.qll
deleted file mode 100644
index cbf1b89dc5c2..000000000000
--- a/rust/ql/lib/codeql/rust/elements/ParenType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ParenType`.
- */
-
-private import internal.ParenTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A ParenType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class ParenType = Impl::ParenType;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ParenTypeRepr.qll
new file mode 100644
index 000000000000..881d1a805fc8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParenTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParenTypeRepr`.
+ */
+
+private import internal.ParenTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A ParenTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ParenTypeRepr = Impl::ParenTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
index e1bf10488e3f..3e7d6e5e40f6 100644
--- a/rust/ql/lib/codeql/rust/elements/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
@@ -14,7 +14,7 @@ import codeql.rust.elements.PathExprBase
  * let x = variable;
  * let x = foo::bar;
  * let y = <T>::foo;
- * let z = <TypeRef as Trait>::foo;
+ * let z = <TypeRepr as Trait>::foo;
  * ```
  */
 final class PathExpr = Impl::PathExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/PathSegment.qll b/rust/ql/lib/codeql/rust/elements/PathSegment.qll
index 9edc7d6573f7..9eb0830a3540 100644
--- a/rust/ql/lib/codeql/rust/elements/PathSegment.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathSegment.qll
@@ -8,10 +8,10 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.ParamList
-import codeql.rust.elements.PathType
-import codeql.rust.elements.RetType
+import codeql.rust.elements.PathTypeRepr
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnTypeSyntax
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A path segment, which is one part of a whole path.
diff --git a/rust/ql/lib/codeql/rust/elements/PathType.qll b/rust/ql/lib/codeql/rust/elements/PathTypeRepr.qll
similarity index 54%
rename from rust/ql/lib/codeql/rust/elements/PathType.qll
rename to rust/ql/lib/codeql/rust/elements/PathTypeRepr.qll
index 773fe910bfa3..684d4429e5f7 100644
--- a/rust/ql/lib/codeql/rust/elements/PathType.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathTypeRepr.qll
@@ -1,11 +1,11 @@
 // generated by codegen, do not edit
 /**
- * This module provides the public class `PathType`.
+ * This module provides the public class `PathTypeRepr`.
  */
 
-private import internal.PathTypeImpl
+private import internal.PathTypeReprImpl
 import codeql.rust.elements.Path
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A type referring to a path. For example:
@@ -14,4 +14,4 @@ import codeql.rust.elements.TypeRef
  * type Y = X::Item;
  * ```
  */
-final class PathType = Impl::PathType;
+final class PathTypeRepr = Impl::PathTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/PtrType.qll b/rust/ql/lib/codeql/rust/elements/PtrType.qll
deleted file mode 100644
index 4a40eaeeb485..000000000000
--- a/rust/ql/lib/codeql/rust/elements/PtrType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `PtrType`.
- */
-
-private import internal.PtrTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A PtrType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class PtrType = Impl::PtrType;
diff --git a/rust/ql/lib/codeql/rust/elements/PtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/PtrTypeRepr.qll
new file mode 100644
index 000000000000..219b8aad5652
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PtrTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PtrTypeRepr`.
+ */
+
+private import internal.PtrTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A PtrTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class PtrTypeRepr = Impl::PtrTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordField.qll b/rust/ql/lib/codeql/rust/elements/RecordField.qll
index d5f4a6a021d7..4a5e749b9050 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordField.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordField.qll
@@ -7,7 +7,7 @@ private import internal.RecordFieldImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/RefType.qll b/rust/ql/lib/codeql/rust/elements/RefType.qll
deleted file mode 100644
index 71ecac73f53a..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RefType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RefType`.
- */
-
-private import internal.RefTypeImpl
-import codeql.rust.elements.Lifetime
-import codeql.rust.elements.TypeRef
-
-/**
- * A RefType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class RefType = Impl::RefType;
diff --git a/rust/ql/lib/codeql/rust/elements/RefTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/RefTypeRepr.qll
new file mode 100644
index 000000000000..95e4e54196f8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RefTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RefTypeRepr`.
+ */
+
+private import internal.RefTypeReprImpl
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A RefTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RefTypeRepr = Impl::RefTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/RetType.qll b/rust/ql/lib/codeql/rust/elements/RetType.qll
deleted file mode 100644
index edca3af1b7a6..000000000000
--- a/rust/ql/lib/codeql/rust/elements/RetType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RetType`.
- */
-
-private import internal.RetTypeImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.TypeRef
-
-/**
- * A RetType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class RetType = Impl::RetType;
diff --git a/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll
new file mode 100644
index 000000000000..05f7cc73e2c8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RetTypeRepr`.
+ */
+
+private import internal.RetTypeReprImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A RetTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RetTypeRepr = Impl::RetTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/SliceType.qll b/rust/ql/lib/codeql/rust/elements/SliceType.qll
deleted file mode 100644
index f87746784115..000000000000
--- a/rust/ql/lib/codeql/rust/elements/SliceType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `SliceType`.
- */
-
-private import internal.SliceTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A SliceType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class SliceType = Impl::SliceType;
diff --git a/rust/ql/lib/codeql/rust/elements/SliceTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/SliceTypeRepr.qll
new file mode 100644
index 000000000000..051eceb5cc23
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/SliceTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `SliceTypeRepr`.
+ */
+
+private import internal.SliceTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A SliceTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class SliceTypeRepr = Impl::SliceTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/Static.qll b/rust/ql/lib/codeql/rust/elements/Static.qll
index 6bc791bd403d..74467dcb7053 100644
--- a/rust/ql/lib/codeql/rust/elements/Static.qll
+++ b/rust/ql/lib/codeql/rust/elements/Static.qll
@@ -9,7 +9,7 @@ import codeql.rust.elements.Expr
 import codeql.rust.elements.ExternItem
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/TupleField.qll b/rust/ql/lib/codeql/rust/elements/TupleField.qll
index a7ad4706e8e6..10e22fd21ae2 100644
--- a/rust/ql/lib/codeql/rust/elements/TupleField.qll
+++ b/rust/ql/lib/codeql/rust/elements/TupleField.qll
@@ -6,7 +6,7 @@
 private import internal.TupleFieldImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/TupleType.qll b/rust/ql/lib/codeql/rust/elements/TupleType.qll
deleted file mode 100644
index a82799ee9de8..000000000000
--- a/rust/ql/lib/codeql/rust/elements/TupleType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `TupleType`.
- */
-
-private import internal.TupleTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A TupleType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class TupleType = Impl::TupleType;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/TupleTypeRepr.qll
new file mode 100644
index 000000000000..66e0645cd1b4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TupleTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TupleTypeRepr`.
+ */
+
+private import internal.TupleTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A TupleTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TupleTypeRepr = Impl::TupleTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
index 2f20a6c0ec6c..a3bd36bf7288 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
diff --git a/rust/ql/lib/codeql/rust/elements/TypeArg.qll b/rust/ql/lib/codeql/rust/elements/TypeArg.qll
index b93f0781adce..42fa984506a6 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeArg.qll
@@ -5,7 +5,7 @@
 
 private import internal.TypeArgImpl
 import codeql.rust.elements.GenericArg
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A TypeArg. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
index 77990f6425b0..6760b562e8f8 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
@@ -7,7 +7,7 @@ private import internal.TypeBoundImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Lifetime
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A TypeBound. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
index 8de967d4f917..bf01aaf6f1f2 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParam
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A TypeParam. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/TypeRef.qll b/rust/ql/lib/codeql/rust/elements/TypeRepr.qll
similarity index 61%
rename from rust/ql/lib/codeql/rust/elements/TypeRef.qll
rename to rust/ql/lib/codeql/rust/elements/TypeRepr.qll
index f30bd7a0a61e..0a9b3066df06 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeRef.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeRepr.qll
@@ -1,9 +1,9 @@
 // generated by codegen, do not edit
 /**
- * This module provides the public class `TypeRef`.
+ * This module provides the public class `TypeRepr`.
  */
 
-private import internal.TypeRefImpl
+private import internal.TypeReprImpl
 import codeql.rust.elements.AstNode
 
 /**
@@ -14,4 +14,4 @@ import codeql.rust.elements.AstNode
  * let z: Option<i32>;
  * ```
  */
-final class TypeRef = Impl::TypeRef;
+final class TypeRepr = Impl::TypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/WherePred.qll b/rust/ql/lib/codeql/rust/elements/WherePred.qll
index 2300be0ad457..3f0bb8c5fe7e 100644
--- a/rust/ql/lib/codeql/rust/elements/WherePred.qll
+++ b/rust/ql/lib/codeql/rust/elements/WherePred.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A WherePred. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll
similarity index 64%
rename from rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll
index 242a3490708b..dfa4be47dfe3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ImplTraitType` synthesized instances.
+ *  `ArrayTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ImplTraitType` synthesized instances.
+ *  The characteristic predicate of `ArrayTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructImplTraitType(Raw::ImplTraitType id) { any() }
+predicate constructArrayTypeRepr(Raw::ArrayTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll
index d1ff17da78d9..f7cf66626a0f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ArrayType`.
+ * This module provides a hand-modifiable wrapper around the generated class `ArrayTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ArrayType
+private import codeql.rust.elements.internal.generated.ArrayTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `ArrayType` and should not
+ * INTERNAL: This module contains the customizable definition of `ArrayTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A ArrayType. For example:
+   * A ArrayTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ArrayType extends Generated::ArrayType { }
+  class ArrayTypeRepr extends Generated::ArrayTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
index 13270d1ca0b3..d44836596fb5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
@@ -20,7 +20,8 @@ module Impl {
    */
   class CastExpr extends Generated::CastExpr {
     override string toString() {
-      result = this.getExpr().toAbbreviatedString() + " as " + this.getTy().toAbbreviatedString()
+      result =
+        this.getExpr().toAbbreviatedString() + " as " + this.getTypeRepr().toAbbreviatedString()
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll
new file mode 100644
index 000000000000..00e5abf9076c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `DynTraitTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `DynTraitTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructDynTraitTypeRepr(Raw::DynTraitTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll
similarity index 69%
rename from rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll
index bba5a65eebde..c9e6bc7ea383 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `DynTraitType`.
+ * This module provides a hand-modifiable wrapper around the generated class `DynTraitTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.DynTraitType
+private import codeql.rust.elements.internal.generated.DynTraitTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `DynTraitType` and should not
+ * INTERNAL: This module contains the customizable definition of `DynTraitTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A DynTraitType. For example:
+   * A DynTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class DynTraitType extends Generated::DynTraitType { }
+  class DynTraitTypeRepr extends Generated::DynTraitTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll
new file mode 100644
index 000000000000..fee493c35005
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FnPtrTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `FnPtrTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFnPtrTypeRepr(Raw::FnPtrTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll
index 63c7420cf330..3710b4589d5d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `FnPtrType`.
+ * This module provides a hand-modifiable wrapper around the generated class `FnPtrTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.FnPtrType
+private import codeql.rust.elements.internal.generated.FnPtrTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `FnPtrType` and should not
+ * INTERNAL: This module contains the customizable definition of `FnPtrTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A FnPtrType. For example:
+   * A FnPtrTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class FnPtrType extends Generated::FnPtrType { }
+  class FnPtrTypeRepr extends Generated::FnPtrTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll
index 8a4ea671b28f..dfae9aac9ee0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ArrayType` synthesized instances.
+ *  `ForTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ArrayType` synthesized instances.
+ *  The characteristic predicate of `ForTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructArrayType(Raw::ArrayType id) { any() }
+predicate constructForTypeRepr(Raw::ForTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
similarity index 61%
rename from rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
index d6465a76dc56..67db6fdcd020 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ForType`.
+ * This module provides a hand-modifiable wrapper around the generated class `ForTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ForType
+private import codeql.rust.elements.internal.generated.ForTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `ForType` and should not
+ * INTERNAL: This module contains the customizable definition of `ForTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A ForType. For example:
+   * A ForTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ForType extends Generated::ForType { }
+  class ForTypeRepr extends Generated::ForTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll
new file mode 100644
index 000000000000..f30ce93e6777
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ImplTraitTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ImplTraitTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructImplTraitTypeRepr(Raw::ImplTraitTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll
similarity index 68%
rename from rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll
index b0aaa982998d..74efa4f2190e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ImplTraitType`.
+ * This module provides a hand-modifiable wrapper around the generated class `ImplTraitTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ImplTraitType
+private import codeql.rust.elements.internal.generated.ImplTraitTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `ImplTraitType` and should not
+ * INTERNAL: This module contains the customizable definition of `ImplTraitTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A ImplTraitType. For example:
+   * A ImplTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ImplTraitType extends Generated::ImplTraitType { }
+  class ImplTraitTypeRepr extends Generated::ImplTraitTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll
new file mode 100644
index 000000000000..c186bea59412
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `InferTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `InferTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructInferTypeRepr(Raw::InferTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
similarity index 77%
rename from rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
index 25c1a40701fd..32144265f0ce 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
@@ -1,24 +1,24 @@
 /**
- * This module provides a hand-modifiable wrapper around the generated class `InferType`.
+ * This module provides a hand-modifiable wrapper around the generated class `InferTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.InferType
+private import codeql.rust.elements.internal.generated.InferTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `InferType` and should not
+ * INTERNAL: This module contains the customizable definition of `InferTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A InferType. For example:
+   * A InferTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class InferType extends Generated::InferType {
+  class InferTypeRepr extends Generated::InferTypeRepr {
     override string toString() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "_" }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll
deleted file mode 100644
index cbe65a8bed71..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `MacroType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `MacroType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructMacroType(Raw::MacroType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll
new file mode 100644
index 000000000000..0464f303116c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroTypeRepr(Raw::MacroTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll
index 6feb1321888d..6ef366ccdfdc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `MacroType`.
+ * This module provides a hand-modifiable wrapper around the generated class `MacroTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.MacroType
+private import codeql.rust.elements.internal.generated.MacroTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `MacroType` and should not
+ * INTERNAL: This module contains the customizable definition of `MacroTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A MacroType. For example:
+   * A MacroTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class MacroType extends Generated::MacroType { }
+  class MacroTypeRepr extends Generated::MacroTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll
deleted file mode 100644
index 10b7b835e819..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `NeverType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `NeverType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructNeverType(Raw::NeverType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll
new file mode 100644
index 000000000000..8587a3842758
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `NeverTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `NeverTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructNeverTypeRepr(Raw::NeverTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
similarity index 77%
rename from rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
index c1858fc9421a..b5a7a7258805 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
@@ -1,24 +1,24 @@
 /**
- * This module provides a hand-modifiable wrapper around the generated class `NeverType`.
+ * This module provides a hand-modifiable wrapper around the generated class `NeverTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.NeverType
+private import codeql.rust.elements.internal.generated.NeverTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `NeverType` and should not
+ * INTERNAL: This module contains the customizable definition of `NeverTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A NeverType. For example:
+   * A NeverTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class NeverType extends Generated::NeverType {
+  class NeverTypeRepr extends Generated::NeverTypeRepr {
     override string toString() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "!" }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
index 02d38d32c386..a76b805f9515 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
@@ -26,7 +26,7 @@ module Impl {
     private string toStringPart(int index) {
       index = 0 and result = this.getPat().toAbbreviatedString()
       or
-      index = 1 and result = ": " + this.getTy().toAbbreviatedString()
+      index = 1 and result = ": " + this.getTypeRepr().toAbbreviatedString()
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll
deleted file mode 100644
index f8450946a0b0..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ParenType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `ParenType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructParenType(Raw::ParenType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll
new file mode 100644
index 000000000000..a8d5e70a008b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParenTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParenTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParenTypeRepr(Raw::ParenTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
index 916758b91333..5c06b951c19d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
@@ -1,24 +1,24 @@
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ParenType`.
+ * This module provides a hand-modifiable wrapper around the generated class `ParenTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ParenType
+private import codeql.rust.elements.internal.generated.ParenTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `ParenType` and should not
+ * INTERNAL: This module contains the customizable definition of `ParenTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A ParenType. For example:
+   * A ParenTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ParenType extends Generated::ParenType {
-    override string toString() { result = "(" + this.getTy().toAbbreviatedString() + ")" }
+  class ParenTypeRepr extends Generated::ParenTypeRepr {
+    override string toString() { result = "(" + this.getTypeRepr().toAbbreviatedString() + ")" }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
index 19445493c889..0d7b29edabee 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
@@ -18,7 +18,7 @@ module Impl {
    * let x = variable;
    * let x = foo::bar;
    * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
+   * let z = <TypeRepr as Trait>::foo;
    * ```
    */
   class PathExpr extends Generated::PathExpr {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
index 7f586afa3755..cbb5313897ed 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
@@ -24,7 +24,7 @@ module Impl {
 
     private string toAbbreviatedStringPart(int index) {
       index = 0 and
-      if this.hasPathType() or this.hasTy()
+      if this.hasPathType() or this.hasTypeRepr()
       then result = "<...>"
       else result = this.getNameRef().getText()
       or
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll
deleted file mode 100644
index f16371570f67..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `PathType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `PathType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructPathType(Raw::PathType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll
similarity index 64%
rename from rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll
index 6ee1e461a53a..5526362a5a3d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `DynTraitType` synthesized instances.
+ *  `PathTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `DynTraitType` synthesized instances.
+ *  The characteristic predicate of `PathTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructDynTraitType(Raw::DynTraitType id) { any() }
+predicate constructPathTypeRepr(Raw::PathTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
similarity index 77%
rename from rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
index 02d8a98d42a3..fb1e8cd380ed 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
@@ -1,13 +1,13 @@
 /**
- * This module provides a hand-modifiable wrapper around the generated class `PathType`.
+ * This module provides a hand-modifiable wrapper around the generated class `PathTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.PathType
+private import codeql.rust.elements.internal.generated.PathTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `PathType` and should not
+ * INTERNAL: This module contains the customizable definition of `PathTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
@@ -19,7 +19,7 @@ module Impl {
    * type Y = X::Item;
    * ```
    */
-  class PathType extends Generated::PathType {
+  class PathTypeRepr extends Generated::PathTypeRepr {
     override string toString() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = this.getPath().toAbbreviatedString() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll
deleted file mode 100644
index 48fb82aeb9e4..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `PtrType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `PtrType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructPtrType(Raw::PtrType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll
deleted file mode 100644
index 95c558cdb81e..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `PtrType`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.PtrType
-
-/**
- * INTERNAL: This module contains the customizable definition of `PtrType` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A PtrType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class PtrType extends Generated::PtrType { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll
index 8bf006797696..cf9de4cd5056 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ForType` synthesized instances.
+ *  `PtrTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ForType` synthesized instances.
+ *  The characteristic predicate of `PtrTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructForType(Raw::ForType id) { any() }
+predicate constructPtrTypeRepr(Raw::PtrTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll
new file mode 100644
index 000000000000..c204a22a4ee9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PtrTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PtrTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PtrTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A PtrTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class PtrTypeRepr extends Generated::PtrTypeRepr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll
deleted file mode 100644
index 89a786420a21..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `RefType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RefType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRefType(Raw::RefType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll
deleted file mode 100644
index c473ec2e8ef4..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `RefType`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RefType
-
-/**
- * INTERNAL: This module contains the customizable definition of `RefType` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A RefType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RefType extends Generated::RefType { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll
index 8c3a0fcf0576..9c53d3b3d69d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `InferType` synthesized instances.
+ *  `RefTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `InferType` synthesized instances.
+ *  The characteristic predicate of `RefTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructInferType(Raw::InferType id) { any() }
+predicate constructRefTypeRepr(Raw::RefTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprImpl.qll
new file mode 100644
index 000000000000..2770b12e9e53
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RefTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RefTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RefTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RefTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RefTypeRepr extends Generated::RefTypeRepr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll
deleted file mode 100644
index c123b5f8b934..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `RetType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RetType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRetType(Raw::RetType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll
deleted file mode 100644
index 9fcda02c6e63..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `RetType`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RetType
-
-/**
- * INTERNAL: This module contains the customizable definition of `RetType` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A RetType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RetType extends Generated::RetType { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll
index a61677766d24..df4a60c37e6c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `FnPtrType` synthesized instances.
+ *  `RetTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `FnPtrType` synthesized instances.
+ *  The characteristic predicate of `RetTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructFnPtrType(Raw::FnPtrType id) { any() }
+predicate constructRetTypeRepr(Raw::RetTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll
new file mode 100644
index 000000000000..4271ec0f7799
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RetTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RetTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RetTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RetTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RetTypeRepr extends Generated::RetTypeRepr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll
deleted file mode 100644
index d337c0f07684..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `SliceType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `SliceType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructSliceType(Raw::SliceType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll
new file mode 100644
index 000000000000..df33789af2d9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `SliceTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `SliceTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructSliceTypeRepr(Raw::SliceTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll
index ba7146aad7ca..4acc2f6aa0a0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `SliceType`.
+ * This module provides a hand-modifiable wrapper around the generated class `SliceTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.SliceType
+private import codeql.rust.elements.internal.generated.SliceTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `SliceType` and should not
+ * INTERNAL: This module contains the customizable definition of `SliceTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A SliceType. For example:
+   * A SliceTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class SliceType extends Generated::SliceType { }
+  class SliceTypeRepr extends Generated::SliceTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll
deleted file mode 100644
index f96bc1826a9d..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `TupleType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `TupleType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructTupleType(Raw::TupleType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll
new file mode 100644
index 000000000000..8f829ace349b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TupleTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TupleTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTupleTypeRepr(Raw::TupleTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll
index 69ac32d20e4c..c0ac7550920a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `TupleType`.
+ * This module provides a hand-modifiable wrapper around the generated class `TupleTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.TupleType
+private import codeql.rust.elements.internal.generated.TupleTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `TupleType` and should not
+ * INTERNAL: This module contains the customizable definition of `TupleTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A TupleType. For example:
+   * A TupleTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class TupleType extends Generated::TupleType { }
+  class TupleTypeRepr extends Generated::TupleTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeRefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeReprImpl.qll
similarity index 72%
rename from rust/ql/lib/codeql/rust/elements/internal/TypeRefImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/TypeReprImpl.qll
index bd2629b84842..0d8b0a9e33b3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeRefImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeReprImpl.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `TypeRef`.
+ * This module provides a hand-modifiable wrapper around the generated class `TypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.TypeRef
+private import codeql.rust.elements.internal.generated.TypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `TypeRef` and should not
+ * INTERNAL: This module contains the customizable definition of `TypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
@@ -20,5 +20,5 @@ module Impl {
    * let z: Option<i32>;
    * ```
    */
-  class TypeRef extends Generated::TypeRef { }
+  class TypeRepr extends Generated::TypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index a9758c455b9b..01d9955b4029 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -100,7 +100,7 @@ module Impl {
         // without implementations
         not exists(Function f | not f.hasBody() and f.getParamList().getAParam().getPat() = pat) and
         // exclude parameters from function pointer types (e.g. `x` in `fn(x: i32) -> i32`)
-        not exists(FnPtrType fp | fp.getParamList().getParam(_).getPat() = pat)
+        not exists(FnPtrTypeRepr fp | fp.getParamList().getParam(_).getPat() = pat)
       )
   }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll
deleted file mode 100644
index 6e4ae1314ce6..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll
+++ /dev/null
@@ -1,57 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ArrayType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.ConstArg
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ArrayType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A ArrayType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::ArrayType` class directly.
-   * Use the subclass `ArrayType`, where the following predicates are available.
-   */
-  class ArrayType extends Synth::TArrayType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "ArrayType" }
-
-    /**
-     * Gets the const argument of this array type, if it exists.
-     */
-    ConstArg getConstArg() {
-      result =
-        Synth::convertConstArgFromRaw(Synth::convertArrayTypeToRaw(this)
-              .(Raw::ArrayType)
-              .getConstArg())
-    }
-
-    /**
-     * Holds if `getConstArg()` exists.
-     */
-    final predicate hasConstArg() { exists(this.getConstArg()) }
-
-    /**
-     * Gets the ty of this array type, if it exists.
-     */
-    TypeRef getTy() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertArrayTypeToRaw(this).(Raw::ArrayType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll
new file mode 100644
index 000000000000..f990c62beec4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll
@@ -0,0 +1,59 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ArrayTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ArrayTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ArrayTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ArrayTypeRepr` class directly.
+   * Use the subclass `ArrayTypeRepr`, where the following predicates are available.
+   */
+  class ArrayTypeRepr extends Synth::TArrayTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "ArrayTypeRepr" }
+
+    /**
+     * Gets the const argument of this array type representation, if it exists.
+     */
+    ConstArg getConstArg() {
+      result =
+        Synth::convertConstArgFromRaw(Synth::convertArrayTypeReprToRaw(this)
+              .(Raw::ArrayTypeRepr)
+              .getConstArg())
+    }
+
+    /**
+     * Holds if `getConstArg()` exists.
+     */
+    final predicate hasConstArg() { exists(this.getConstArg()) }
+
+    /**
+     * Gets the element type representation of this array type representation, if it exists.
+     */
+    TypeRepr getElementTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertArrayTypeReprToRaw(this)
+              .(Raw::ArrayTypeRepr)
+              .getElementTypeRepr())
+    }
+
+    /**
+     * Holds if `getElementTypeRepr()` exists.
+     */
+    final predicate hasElementTypeRepr() { exists(this.getElementTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
index 940e76ebbbcb..fff85bc88af5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
@@ -11,10 +11,10 @@ import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.ParamList
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnTypeSyntax
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `AssocTypeArg` and should not
@@ -95,9 +95,9 @@ module Generated {
     /**
      * Gets the ret type of this assoc type argument, if it exists.
      */
-    RetType getRetType() {
+    RetTypeRepr getRetType() {
       result =
-        Synth::convertRetTypeFromRaw(Synth::convertAssocTypeArgToRaw(this)
+        Synth::convertRetTypeReprFromRaw(Synth::convertAssocTypeArgToRaw(this)
               .(Raw::AssocTypeArg)
               .getRetType())
     }
@@ -123,19 +123,19 @@ module Generated {
     final predicate hasReturnTypeSyntax() { exists(this.getReturnTypeSyntax()) }
 
     /**
-     * Gets the ty of this assoc type argument, if it exists.
+     * Gets the type representation of this assoc type argument, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertAssocTypeArgToRaw(this)
+        Synth::convertTypeReprFromRaw(Synth::convertAssocTypeArgToRaw(this)
               .(Raw::AssocTypeArg)
-              .getTy())
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the type bound list of this assoc type argument, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
index d741991d0014..ddd1d312c6b3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
@@ -29,7 +29,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "BoxPat" }
 
     /**
-     * Gets the pat of this box pat, if it exists.
+     * Gets the pattern of this box pattern, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertBoxPatToRaw(this).(Raw::BoxPat).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
index 9ede7cd7f336..dda6547fabbc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `CastExpr` and should not
@@ -59,16 +59,18 @@ module Generated {
     final predicate hasExpr() { exists(this.getExpr()) }
 
     /**
-     * Gets the ty of this cast expression, if it exists.
+     * Gets the type representation of this cast expression, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertCastExprToRaw(this)
+              .(Raw::CastExpr)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
index 0e107c2301d2..70a3c374e0d1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.internal.CallableImpl::Impl as CallableImpl
 import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `ClosureExpr` and should not
@@ -90,9 +90,9 @@ module Generated {
     /**
      * Gets the ret type of this closure expression, if it exists.
      */
-    RetType getRetType() {
+    RetTypeRepr getRetType() {
       result =
-        Synth::convertRetTypeFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertRetTypeReprFromRaw(Synth::convertClosureExprToRaw(this)
               .(Raw::ClosureExpr)
               .getRetType())
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
index a9b1932a935b..d63e58f120b2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
@@ -82,16 +82,17 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this const, if it exists.
+     * Gets the type representation of this const, if it exists.
      */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getTy())
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the visibility of this const, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
index 2935c7c8f85b..971308952917 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
@@ -29,7 +29,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ConstBlockPat" }
 
     /**
-     * Gets the block expression of this const block pat, if it exists.
+     * Gets the block expression of this const block pattern, if it exists.
      */
     BlockExpr getBlockExpr() {
       result =
@@ -44,7 +44,7 @@ module Generated {
     final predicate hasBlockExpr() { exists(this.getBlockExpr()) }
 
     /**
-     * Holds if this const block pat is const.
+     * Holds if this const block pattern is const.
      */
     predicate isConst() { Synth::convertConstBlockPatToRaw(this).(Raw::ConstBlockPat).isConst() }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
index 451234d3dc1b..3069e5bc63cf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.ConstArg
 import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `ConstParam` and should not
@@ -82,16 +82,18 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this const parameter, if it exists.
+     * Gets the type representation of this const parameter, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertConstParamToRaw(this).(Raw::ConstParam).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertConstParamToRaw(this)
+              .(Raw::ConstParam)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll
similarity index 60%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll
index acd35715487d..3ba7a5e4997a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll
@@ -1,37 +1,37 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `DynTraitType`.
+ * This module provides the generated definition of `DynTraitTypeRepr`.
  * INTERNAL: Do not import directly.
  */
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
 
 /**
- * INTERNAL: This module contains the fully generated definition of `DynTraitType` and should not
+ * INTERNAL: This module contains the fully generated definition of `DynTraitTypeRepr` and should not
  * be referenced directly.
  */
 module Generated {
   /**
-   * A DynTraitType. For example:
+   * A DynTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
-   * INTERNAL: Do not reference the `Generated::DynTraitType` class directly.
-   * Use the subclass `DynTraitType`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::DynTraitTypeRepr` class directly.
+   * Use the subclass `DynTraitTypeRepr`, where the following predicates are available.
    */
-  class DynTraitType extends Synth::TDynTraitType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "DynTraitType" }
+  class DynTraitTypeRepr extends Synth::TDynTraitTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "DynTraitTypeRepr" }
 
     /**
-     * Gets the type bound list of this dyn trait type, if it exists.
+     * Gets the type bound list of this dyn trait type representation, if it exists.
      */
     TypeBoundList getTypeBoundList() {
       result =
-        Synth::convertTypeBoundListFromRaw(Synth::convertDynTraitTypeToRaw(this)
-              .(Raw::DynTraitType)
+        Synth::convertTypeBoundListFromRaw(Synth::convertDynTraitTypeReprToRaw(this)
+              .(Raw::DynTraitTypeRepr)
               .getTypeBoundList())
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
deleted file mode 100644
index 8296c401fa85..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
+++ /dev/null
@@ -1,88 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `FnPtrType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Abi
-import codeql.rust.elements.ParamList
-import codeql.rust.elements.RetType
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `FnPtrType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A FnPtrType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::FnPtrType` class directly.
-   * Use the subclass `FnPtrType`, where the following predicates are available.
-   */
-  class FnPtrType extends Synth::TFnPtrType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "FnPtrType" }
-
-    /**
-     * Gets the abi of this fn ptr type, if it exists.
-     */
-    Abi getAbi() {
-      result =
-        Synth::convertAbiFromRaw(Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).getAbi())
-    }
-
-    /**
-     * Holds if `getAbi()` exists.
-     */
-    final predicate hasAbi() { exists(this.getAbi()) }
-
-    /**
-     * Holds if this fn ptr type is async.
-     */
-    predicate isAsync() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isAsync() }
-
-    /**
-     * Holds if this fn ptr type is const.
-     */
-    predicate isConst() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isConst() }
-
-    /**
-     * Holds if this fn ptr type is unsafe.
-     */
-    predicate isUnsafe() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isUnsafe() }
-
-    /**
-     * Gets the parameter list of this fn ptr type, if it exists.
-     */
-    ParamList getParamList() {
-      result =
-        Synth::convertParamListFromRaw(Synth::convertFnPtrTypeToRaw(this)
-              .(Raw::FnPtrType)
-              .getParamList())
-    }
-
-    /**
-     * Holds if `getParamList()` exists.
-     */
-    final predicate hasParamList() { exists(this.getParamList()) }
-
-    /**
-     * Gets the ret type of this fn ptr type, if it exists.
-     */
-    RetType getRetType() {
-      result =
-        Synth::convertRetTypeFromRaw(Synth::convertFnPtrTypeToRaw(this)
-              .(Raw::FnPtrType)
-              .getRetType())
-    }
-
-    /**
-     * Holds if `getRetType()` exists.
-     */
-    final predicate hasRetType() { exists(this.getRetType()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll
new file mode 100644
index 000000000000..ebdbe7e772f4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll
@@ -0,0 +1,90 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FnPtrTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Abi
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetTypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FnPtrTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A FnPtrTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::FnPtrTypeRepr` class directly.
+   * Use the subclass `FnPtrTypeRepr`, where the following predicates are available.
+   */
+  class FnPtrTypeRepr extends Synth::TFnPtrTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "FnPtrTypeRepr" }
+
+    /**
+     * Gets the abi of this fn ptr type representation, if it exists.
+     */
+    Abi getAbi() {
+      result =
+        Synth::convertAbiFromRaw(Synth::convertFnPtrTypeReprToRaw(this)
+              .(Raw::FnPtrTypeRepr)
+              .getAbi())
+    }
+
+    /**
+     * Holds if `getAbi()` exists.
+     */
+    final predicate hasAbi() { exists(this.getAbi()) }
+
+    /**
+     * Holds if this fn ptr type representation is async.
+     */
+    predicate isAsync() { Synth::convertFnPtrTypeReprToRaw(this).(Raw::FnPtrTypeRepr).isAsync() }
+
+    /**
+     * Holds if this fn ptr type representation is const.
+     */
+    predicate isConst() { Synth::convertFnPtrTypeReprToRaw(this).(Raw::FnPtrTypeRepr).isConst() }
+
+    /**
+     * Holds if this fn ptr type representation is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertFnPtrTypeReprToRaw(this).(Raw::FnPtrTypeRepr).isUnsafe() }
+
+    /**
+     * Gets the parameter list of this fn ptr type representation, if it exists.
+     */
+    ParamList getParamList() {
+      result =
+        Synth::convertParamListFromRaw(Synth::convertFnPtrTypeReprToRaw(this)
+              .(Raw::FnPtrTypeRepr)
+              .getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the ret type of this fn ptr type representation, if it exists.
+     */
+    RetTypeRepr getRetType() {
+      result =
+        Synth::convertRetTypeReprFromRaw(Synth::convertFnPtrTypeReprToRaw(this)
+              .(Raw::FnPtrTypeRepr)
+              .getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
index 202b1736fc49..1804f3c70584 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
@@ -59,7 +59,7 @@ module Generated {
     final predicate hasIterable() { exists(this.getIterable()) }
 
     /**
-     * Gets the pat of this for expression, if it exists.
+     * Gets the pattern of this for expression, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll
deleted file mode 100644
index 0230cd6cd448..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll
+++ /dev/null
@@ -1,56 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ForType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ForType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A ForType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::ForType` class directly.
-   * Use the subclass `ForType`, where the following predicates are available.
-   */
-  class ForType extends Synth::TForType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "ForType" }
-
-    /**
-     * Gets the generic parameter list of this for type, if it exists.
-     */
-    GenericParamList getGenericParamList() {
-      result =
-        Synth::convertGenericParamListFromRaw(Synth::convertForTypeToRaw(this)
-              .(Raw::ForType)
-              .getGenericParamList())
-    }
-
-    /**
-     * Holds if `getGenericParamList()` exists.
-     */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
-
-    /**
-     * Gets the ty of this for type, if it exists.
-     */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertForTypeToRaw(this).(Raw::ForType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
new file mode 100644
index 000000000000..6f539d1e7f22
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
@@ -0,0 +1,59 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ForTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ForTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ForTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ForTypeRepr` class directly.
+   * Use the subclass `ForTypeRepr`, where the following predicates are available.
+   */
+  class ForTypeRepr extends Synth::TForTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "ForTypeRepr" }
+
+    /**
+     * Gets the generic parameter list of this for type representation, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertForTypeReprToRaw(this)
+              .(Raw::ForTypeRepr)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the type representation of this for type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertForTypeReprToRaw(this)
+              .(Raw::ForTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
index cc0179cb15b9..82914663b940 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
@@ -14,7 +14,7 @@ import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
@@ -123,9 +123,11 @@ module Generated {
     /**
      * Gets the ret type of this function, if it exists.
      */
-    RetType getRetType() {
+    RetTypeRepr getRetType() {
       result =
-        Synth::convertRetTypeFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getRetType())
+        Synth::convertRetTypeReprFromRaw(Synth::convertFunctionToRaw(this)
+              .(Raw::Function)
+              .getRetType())
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
index 275272f06a0d..d016899bc01d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
@@ -37,7 +37,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "IdentPat" }
 
     /**
-     * Gets the `index`th attr of this ident pat (0-based).
+     * Gets the `index`th attr of this ident pattern (0-based).
      */
     Attr getAttr(int index) {
       result =
@@ -45,27 +45,27 @@ module Generated {
     }
 
     /**
-     * Gets any of the attrs of this ident pat.
+     * Gets any of the attrs of this ident pattern.
      */
     final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of attrs of this ident pat.
+     * Gets the number of attrs of this ident pattern.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Holds if this ident pat is mut.
+     * Holds if this ident pattern is mut.
      */
     predicate isMut() { Synth::convertIdentPatToRaw(this).(Raw::IdentPat).isMut() }
 
     /**
-     * Holds if this ident pat is reference.
+     * Holds if this ident pattern is reference.
      */
     predicate isRef() { Synth::convertIdentPatToRaw(this).(Raw::IdentPat).isRef() }
 
     /**
-     * Gets the name of this ident pat, if it exists.
+     * Gets the name of this ident pattern, if it exists.
      */
     Name getName() {
       result =
@@ -78,7 +78,7 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the pat of this ident pat, if it exists.
+     * Gets the pattern of this ident pattern, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
index 14ec8ee38630..65b4a330b948 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.AssocItemList
 import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
@@ -95,8 +95,8 @@ module Generated {
     /**
      * Gets the self ty of this impl, if it exists.
      */
-    TypeRef getSelfTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getSelfTy())
+    TypeRepr getSelfTy() {
+      result = Synth::convertTypeReprFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getSelfTy())
     }
 
     /**
@@ -107,8 +107,8 @@ module Generated {
     /**
      * Gets the trait of this impl, if it exists.
      */
-    TypeRef getTrait() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getTrait())
+    TypeRepr getTrait() {
+      result = Synth::convertTypeReprFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getTrait())
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll
similarity index 59%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll
index 1346e89d1259..ab4d36247e07 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll
@@ -1,37 +1,37 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `ImplTraitType`.
+ * This module provides the generated definition of `ImplTraitTypeRepr`.
  * INTERNAL: Do not import directly.
  */
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
 
 /**
- * INTERNAL: This module contains the fully generated definition of `ImplTraitType` and should not
+ * INTERNAL: This module contains the fully generated definition of `ImplTraitTypeRepr` and should not
  * be referenced directly.
  */
 module Generated {
   /**
-   * A ImplTraitType. For example:
+   * A ImplTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
-   * INTERNAL: Do not reference the `Generated::ImplTraitType` class directly.
-   * Use the subclass `ImplTraitType`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::ImplTraitTypeRepr` class directly.
+   * Use the subclass `ImplTraitTypeRepr`, where the following predicates are available.
    */
-  class ImplTraitType extends Synth::TImplTraitType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "ImplTraitType" }
+  class ImplTraitTypeRepr extends Synth::TImplTraitTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "ImplTraitTypeRepr" }
 
     /**
-     * Gets the type bound list of this impl trait type, if it exists.
+     * Gets the type bound list of this impl trait type representation, if it exists.
      */
     TypeBoundList getTypeBoundList() {
       result =
-        Synth::convertTypeBoundListFromRaw(Synth::convertImplTraitTypeToRaw(this)
-              .(Raw::ImplTraitType)
+        Synth::convertTypeBoundListFromRaw(Synth::convertImplTraitTypeReprToRaw(this)
+              .(Raw::ImplTraitTypeRepr)
               .getTypeBoundList())
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll
deleted file mode 100644
index 09c8169a0b3e..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll
+++ /dev/null
@@ -1,27 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `InferType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `InferType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A InferType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::InferType` class directly.
-   * Use the subclass `InferType`, where the following predicates are available.
-   */
-  class InferType extends Synth::TInferType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "InferType" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll
new file mode 100644
index 000000000000..a4e874d3a9ad
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `InferTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `InferTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A InferTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::InferTypeRepr` class directly.
+   * Use the subclass `InferTypeRepr`, where the following predicates are available.
+   */
+  class InferTypeRepr extends Synth::TInferTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "InferTypeRepr" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
index c887afa603d9..45e0fa589dab 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
@@ -61,7 +61,7 @@ module Generated {
     final predicate hasScrutinee() { exists(this.getScrutinee()) }
 
     /**
-     * Gets the pat of this let expression, if it exists.
+     * Gets the pattern of this let expression, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
index 3555636dc329..c971a1548a56 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.Expr
 import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
 import codeql.rust.elements.internal.StmtImpl::Impl as StmtImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `LetStmt` and should not
@@ -81,7 +81,7 @@ module Generated {
     final predicate hasLetElse() { exists(this.getLetElse()) }
 
     /**
-     * Gets the pat of this let statement, if it exists.
+     * Gets the pattern of this let statement, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getPat())
@@ -93,15 +93,16 @@ module Generated {
     final predicate hasPat() { exists(this.getPat()) }
 
     /**
-     * Gets the ty of this let statement, if it exists.
+     * Gets the type representation of this let statement, if it exists.
      */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getTy())
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
index 84afc44e9e62..e3e6c7bd264b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
@@ -29,7 +29,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LiteralPat" }
 
     /**
-     * Gets the literal of this literal pat, if it exists.
+     * Gets the literal of this literal pattern, if it exists.
      */
     LiteralExpr getLiteral() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
index 79a261adb09a..cddbc98a799e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
@@ -26,7 +26,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "MacroPat" }
 
     /**
-     * Gets the macro call of this macro pat, if it exists.
+     * Gets the macro call of this macro pattern, if it exists.
      */
     MacroCall getMacroCall() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll
deleted file mode 100644
index f2fd6ceb9ebf..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll
+++ /dev/null
@@ -1,43 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `MacroType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.MacroCall
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `MacroType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A MacroType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::MacroType` class directly.
-   * Use the subclass `MacroType`, where the following predicates are available.
-   */
-  class MacroType extends Synth::TMacroType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "MacroType" }
-
-    /**
-     * Gets the macro call of this macro type, if it exists.
-     */
-    MacroCall getMacroCall() {
-      result =
-        Synth::convertMacroCallFromRaw(Synth::convertMacroTypeToRaw(this)
-              .(Raw::MacroType)
-              .getMacroCall())
-    }
-
-    /**
-     * Holds if `getMacroCall()` exists.
-     */
-    final predicate hasMacroCall() { exists(this.getMacroCall()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll
new file mode 100644
index 000000000000..8664ef91110f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MacroTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroTypeRepr` class directly.
+   * Use the subclass `MacroTypeRepr`, where the following predicates are available.
+   */
+  class MacroTypeRepr extends Synth::TMacroTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "MacroTypeRepr" }
+
+    /**
+     * Gets the macro call of this macro type representation, if it exists.
+     */
+    MacroCall getMacroCall() {
+      result =
+        Synth::convertMacroCallFromRaw(Synth::convertMacroTypeReprToRaw(this)
+              .(Raw::MacroTypeRepr)
+              .getMacroCall())
+    }
+
+    /**
+     * Holds if `getMacroCall()` exists.
+     */
+    final predicate hasMacroCall() { exists(this.getMacroCall()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
index ae078cdfad42..47782a2accb1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
@@ -82,7 +82,7 @@ module Generated {
     final predicate hasGuard() { exists(this.getGuard()) }
 
     /**
-     * Gets the pat of this match arm, if it exists.
+     * Gets the pattern of this match arm, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll
deleted file mode 100644
index 8bc481b5f2ac..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll
+++ /dev/null
@@ -1,27 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `NeverType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `NeverType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A NeverType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::NeverType` class directly.
-   * Use the subclass `NeverType`, where the following predicates are available.
-   */
-  class NeverType extends Synth::TNeverType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "NeverType" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll
new file mode 100644
index 000000000000..54d2ecf8a042
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `NeverTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `NeverTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A NeverTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::NeverTypeRepr` class directly.
+   * Use the subclass `NeverTypeRepr`, where the following predicates are available.
+   */
+  class NeverTypeRepr extends Synth::TNeverTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "NeverTypeRepr" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
index 3c41c47dbdcb..c66a1af823a3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `OffsetOfExpr` and should not
@@ -68,18 +68,18 @@ module Generated {
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
 
     /**
-     * Gets the ty of this offset of expression, if it exists.
+     * Gets the type representation of this offset of expression, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertOffsetOfExprToRaw(this)
+        Synth::convertTypeReprFromRaw(Synth::convertOffsetOfExprToRaw(this)
               .(Raw::OffsetOfExpr)
-              .getTy())
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
index cfa9d9f76150..548ca32eb5ff 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
@@ -28,19 +28,19 @@ module Generated {
     override string getAPrimaryQlClass() { result = "OrPat" }
 
     /**
-     * Gets the `index`th pat of this or pat (0-based).
+     * Gets the `index`th pattern of this or pattern (0-based).
      */
     Pat getPat(int index) {
       result = Synth::convertPatFromRaw(Synth::convertOrPatToRaw(this).(Raw::OrPat).getPat(index))
     }
 
     /**
-     * Gets any of the pats of this or pat.
+     * Gets any of the patterns of this or pattern.
      */
     final Pat getAPat() { result = this.getPat(_) }
 
     /**
-     * Gets the number of pats of this or pat.
+     * Gets the number of patterns of this or pattern.
      */
     final int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
index 2bbbc81b2c9f..8e6176de53cc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
@@ -28,7 +28,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "Param" }
 
     /**
-     * Gets the pat of this parameter, if it exists.
+     * Gets the pattern of this parameter, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll
index ea5ef12a64f5..3202b2149e41 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll
@@ -8,7 +8,7 @@ private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.Attr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `ParamBase` and should not
@@ -40,16 +40,18 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the ty of this parameter base, if it exists.
+     * Gets the type representation of this parameter base, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertParamBaseToRaw(this).(Raw::ParamBase).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertParamBaseToRaw(this)
+              .(Raw::ParamBase)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
index 411362dde2ba..7ba7741583c8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
@@ -26,7 +26,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ParenPat" }
 
     /**
-     * Gets the pat of this paren pat, if it exists.
+     * Gets the pattern of this paren pattern, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertParenPatToRaw(this).(Raw::ParenPat).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll
deleted file mode 100644
index abc547266e90..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll
+++ /dev/null
@@ -1,41 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ParenType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ParenType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A ParenType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::ParenType` class directly.
-   * Use the subclass `ParenType`, where the following predicates are available.
-   */
-  class ParenType extends Synth::TParenType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "ParenType" }
-
-    /**
-     * Gets the ty of this paren type, if it exists.
-     */
-    TypeRef getTy() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertParenTypeToRaw(this).(Raw::ParenType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll
new file mode 100644
index 000000000000..1ebed2ef11a9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParenTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParenTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ParenTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ParenTypeRepr` class directly.
+   * Use the subclass `ParenTypeRepr`, where the following predicates are available.
+   */
+  class ParenTypeRepr extends Synth::TParenTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "ParenTypeRepr" }
+
+    /**
+     * Gets the type representation of this paren type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertParenTypeReprToRaw(this)
+              .(Raw::ParenTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index dbf0d9d3191b..84c4c1472788 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -619,12 +619,12 @@ private module Impl {
   }
 
   private Element getImmediateChildOfParamBase(ParamBase e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nAttr, int nTy |
+    exists(int b, int bAstNode, int n, int nAttr, int nTypeRepr |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nTy = nAttr + 1 and
+      nTypeRepr = nAttr + 1 and
       (
         none()
         or
@@ -633,7 +633,7 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nAttr and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -676,7 +676,7 @@ private module Impl {
   ) {
     exists(
       int b, int bAstNode, int n, int nGenericArgList, int nNameRef, int nParamList, int nPathType,
-      int nRetType, int nReturnTypeSyntax, int nTy
+      int nRetType, int nReturnTypeSyntax, int nTypeRepr
     |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
@@ -687,7 +687,7 @@ private module Impl {
       nPathType = nParamList + 1 and
       nRetType = nPathType + 1 and
       nReturnTypeSyntax = nRetType + 1 and
-      nTy = nReturnTypeSyntax + 1 and
+      nTypeRepr = nReturnTypeSyntax + 1 and
       (
         none()
         or
@@ -707,7 +707,9 @@ private module Impl {
         result = e.getReturnTypeSyntax() and
         partialPredicateCall = "ReturnTypeSyntax()"
         or
-        index = nReturnTypeSyntax and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nReturnTypeSyntax and
+        result = e.getTypeRepr() and
+        partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -766,14 +768,14 @@ private module Impl {
   private Element getImmediateChildOfRecordField(
     RecordField e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n, int nAttr, int nName, int nTy, int nVisibility |
+    exists(int b, int bAstNode, int n, int nAttr, int nName, int nTypeRepr, int nVisibility |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nName = nAttr + 1 and
-      nTy = nName + 1 and
-      nVisibility = nTy + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
       (
         none()
         or
@@ -784,9 +786,9 @@ private module Impl {
         or
         index = nAttr and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
@@ -867,18 +869,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfRetType(RetType e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nTy |
+  private Element getImmediateChildOfRetTypeRepr(
+    RetTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nTypeRepr |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
-      nTy = n + 1 and
+      nTypeRepr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -983,13 +987,13 @@ private module Impl {
   }
 
   private Element getImmediateChildOfTupleField(TupleField e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nAttr, int nTy, int nVisibility |
+    exists(int b, int bAstNode, int n, int nAttr, int nTypeRepr, int nVisibility |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nTy = nAttr + 1 and
-      nVisibility = nTy + 1 and
+      nTypeRepr = nAttr + 1 and
+      nVisibility = nTypeRepr + 1 and
       (
         none()
         or
@@ -998,21 +1002,21 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nAttr and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
 
   private Element getImmediateChildOfTypeBound(TypeBound e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTy |
+    exists(int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTypeRepr |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nGenericParamList = n + 1 and
       nLifetime = nGenericParamList + 1 and
-      nTy = nLifetime + 1 and
+      nTypeRepr = nLifetime + 1 and
       (
         none()
         or
@@ -1026,7 +1030,7 @@ private module Impl {
         result = e.getLifetime() and
         partialPredicateCall = "Lifetime()"
         or
-        index = nLifetime and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1050,7 +1054,7 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfTypeRef(TypeRef e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfTypeRepr(TypeRepr e, int index, string partialPredicateCall) {
     exists(int b, int bAstNode, int n |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
@@ -1160,15 +1164,16 @@ private module Impl {
 
   private Element getImmediateChildOfWherePred(WherePred e, int index, string partialPredicateCall) {
     exists(
-      int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTy, int nTypeBoundList
+      int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTypeRepr,
+      int nTypeBoundList
     |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nGenericParamList = n + 1 and
       nLifetime = nGenericParamList + 1 and
-      nTy = nLifetime + 1 and
-      nTypeBoundList = nTy + 1 and
+      nTypeRepr = nLifetime + 1 and
+      nTypeBoundList = nTypeRepr + 1 and
       (
         none()
         or
@@ -1182,9 +1187,11 @@ private module Impl {
         result = e.getLifetime() and
         partialPredicateCall = "Lifetime()"
         or
-        index = nLifetime and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        index = nTypeRepr and
+        result = e.getTypeBoundList() and
+        partialPredicateCall = "TypeBoundList()"
       )
     )
   }
@@ -1233,21 +1240,25 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfArrayType(ArrayType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nConstArg, int nTy |
+  private Element getImmediateChildOfArrayTypeRepr(
+    ArrayTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nConstArg, int nElementTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nConstArg = n + 1 and
-      nTy = nConstArg + 1 and
+      nElementTypeRepr = nConstArg + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getConstArg() and partialPredicateCall = "ConstArg()"
         or
-        index = nConstArg and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nConstArg and
+        result = e.getElementTypeRepr() and
+        partialPredicateCall = "ElementTypeRepr()"
       )
     )
   }
@@ -1277,7 +1288,7 @@ private module Impl {
   ) {
     exists(
       int b, int bGenericArg, int n, int nConstArg, int nGenericArgList, int nNameRef,
-      int nParamList, int nRetType, int nReturnTypeSyntax, int nTy, int nTypeBoundList
+      int nParamList, int nRetType, int nReturnTypeSyntax, int nTypeRepr, int nTypeBoundList
     |
       b = 0 and
       bGenericArg =
@@ -1289,8 +1300,8 @@ private module Impl {
       nParamList = nNameRef + 1 and
       nRetType = nParamList + 1 and
       nReturnTypeSyntax = nRetType + 1 and
-      nTy = nReturnTypeSyntax + 1 and
-      nTypeBoundList = nTy + 1 and
+      nTypeRepr = nReturnTypeSyntax + 1 and
+      nTypeBoundList = nTypeRepr + 1 and
       (
         none()
         or
@@ -1312,9 +1323,13 @@ private module Impl {
         result = e.getReturnTypeSyntax() and
         partialPredicateCall = "ReturnTypeSyntax()"
         or
-        index = nReturnTypeSyntax and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nReturnTypeSyntax and
+        result = e.getTypeRepr() and
+        partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        index = nTypeRepr and
+        result = e.getTypeBoundList() and
+        partialPredicateCall = "TypeBoundList()"
       )
     )
   }
@@ -1444,13 +1459,13 @@ private module Impl {
   }
 
   private Element getImmediateChildOfCastExpr(CastExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nTy |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nTypeRepr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nExpr = nAttr + 1 and
-      nTy = nExpr + 1 and
+      nTypeRepr = nExpr + 1 and
       (
         none()
         or
@@ -1461,7 +1476,7 @@ private module Impl {
         or
         index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
         or
-        index = nExpr and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nExpr and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1543,7 +1558,7 @@ private module Impl {
   }
 
   private Element getImmediateChildOfConstParam(ConstParam e, int index, string partialPredicateCall) {
-    exists(int b, int bGenericParam, int n, int nAttr, int nDefaultVal, int nName, int nTy |
+    exists(int b, int bGenericParam, int n, int nAttr, int nDefaultVal, int nName, int nTypeRepr |
       b = 0 and
       bGenericParam =
         b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericParam(e, i, _)) | i) and
@@ -1551,7 +1566,7 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nDefaultVal = nAttr + 1 and
       nName = nDefaultVal + 1 and
-      nTy = nName + 1 and
+      nTypeRepr = nName + 1 and
       (
         none()
         or
@@ -1564,7 +1579,7 @@ private module Impl {
         or
         index = nDefaultVal and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1591,18 +1606,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfDynTraitType(
-    DynTraitType e, int index, string partialPredicateCall
+  private Element getImmediateChildOfDynTraitTypeRepr(
+    DynTraitTypeRepr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bTypeRef, int n, int nTypeBoundList |
+    exists(int b, int bTypeRepr, int n, int nTypeBoundList |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nTypeBoundList = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
       )
@@ -1648,18 +1663,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfFnPtrType(FnPtrType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nAbi, int nParamList, int nRetType |
+  private Element getImmediateChildOfFnPtrTypeRepr(
+    FnPtrTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nAbi, int nParamList, int nRetType |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nAbi = n + 1 and
       nParamList = nAbi + 1 and
       nRetType = nParamList + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getAbi() and partialPredicateCall = "Abi()"
         or
@@ -1670,23 +1687,27 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfForType(ForType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nGenericParamList, int nTy |
+  private Element getImmediateChildOfForTypeRepr(
+    ForTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nGenericParamList, int nTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nGenericParamList = n + 1 and
-      nTy = nGenericParamList + 1 and
+      nTypeRepr = nGenericParamList + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and
         result = e.getGenericParamList() and
         partialPredicateCall = "GenericParamList()"
         or
-        index = nGenericParamList and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nGenericParamList and
+        result = e.getTypeRepr() and
+        partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1770,18 +1791,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfImplTraitType(
-    ImplTraitType e, int index, string partialPredicateCall
+  private Element getImmediateChildOfImplTraitTypeRepr(
+    ImplTraitTypeRepr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bTypeRef, int n, int nTypeBoundList |
+    exists(int b, int bTypeRepr, int n, int nTypeBoundList |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nTypeBoundList = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
       )
@@ -1811,15 +1832,17 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfInferType(InferType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n |
+  private Element getImmediateChildOfInferTypeRepr(
+    InferTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
       )
     )
   }
@@ -1883,7 +1906,9 @@ private module Impl {
   }
 
   private Element getImmediateChildOfLetStmt(LetStmt e, int index, string partialPredicateCall) {
-    exists(int b, int bStmt, int n, int nAttr, int nInitializer, int nLetElse, int nPat, int nTy |
+    exists(
+      int b, int bStmt, int n, int nAttr, int nInitializer, int nLetElse, int nPat, int nTypeRepr
+    |
       b = 0 and
       bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
       n = bStmt and
@@ -1891,7 +1916,7 @@ private module Impl {
       nInitializer = nAttr + 1 and
       nLetElse = nInitializer + 1 and
       nPat = nLetElse + 1 and
-      nTy = nPat + 1 and
+      nTypeRepr = nPat + 1 and
       (
         none()
         or
@@ -1906,7 +1931,7 @@ private module Impl {
         or
         index = nLetElse and result = e.getPat() and partialPredicateCall = "Pat()"
         or
-        index = nPat and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nPat and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2025,16 +2050,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfMacroType(MacroType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nMacroCall |
+  private Element getImmediateChildOfMacroTypeRepr(
+    MacroTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nMacroCall |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nMacroCall = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getMacroCall() and partialPredicateCall = "MacroCall()"
       )
@@ -2066,15 +2093,17 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfNeverType(NeverType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n |
+  private Element getImmediateChildOfNeverTypeRepr(
+    NeverTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
       )
     )
   }
@@ -2082,13 +2111,13 @@ private module Impl {
   private Element getImmediateChildOfOffsetOfExpr(
     OffsetOfExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n, int nAttr, int nField, int nTy |
+    exists(int b, int bExpr, int n, int nAttr, int nField, int nTypeRepr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nField = nAttr + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
-      nTy = nField + 1 and
+      nTypeRepr = nField + 1 and
       (
         none()
         or
@@ -2100,7 +2129,7 @@ private module Impl {
         result = e.getField(index - nAttr) and
         partialPredicateCall = "Field(" + (index - nAttr).toString() + ")"
         or
-        index = nField and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nField and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2174,18 +2203,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfParenType(ParenType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nTy |
+  private Element getImmediateChildOfParenTypeRepr(
+    ParenTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
-      nTy = n + 1 and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
+      nTypeRepr = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2241,16 +2272,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfPathType(PathType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nPath |
+  private Element getImmediateChildOfPathTypeRepr(
+    PathTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nPath |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nPath = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getPath() and partialPredicateCall = "Path()"
       )
@@ -2277,18 +2310,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfPtrType(PtrType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nTy |
+  private Element getImmediateChildOfPtrTypeRepr(
+    PtrTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
-      nTy = n + 1 and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
+      nTypeRepr = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2432,21 +2467,23 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfRefType(RefType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nLifetime, int nTy |
+  private Element getImmediateChildOfRefTypeRepr(
+    RefTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nLifetime, int nTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nLifetime = n + 1 and
-      nTy = nLifetime + 1 and
+      nTypeRepr = nLifetime + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
         or
-        index = nLifetime and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2524,18 +2561,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfSliceType(SliceType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nTy |
+  private Element getImmediateChildOfSliceTypeRepr(
+    SliceTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
-      nTy = n + 1 and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
+      nTypeRepr = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2639,16 +2678,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfTupleType(TupleType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nField |
+  private Element getImmediateChildOfTupleTypeRepr(
+    TupleTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nField |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         result = e.getField(index - n) and
         partialPredicateCall = "Field(" + (index - n).toString() + ")"
@@ -2657,18 +2698,18 @@ private module Impl {
   }
 
   private Element getImmediateChildOfTypeArg(TypeArg e, int index, string partialPredicateCall) {
-    exists(int b, int bGenericArg, int n, int nTy |
+    exists(int b, int bGenericArg, int n, int nTypeRepr |
       b = 0 and
       bGenericArg =
         b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
       n = bGenericArg and
-      nTy = n + 1 and
+      nTypeRepr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2887,7 +2928,7 @@ private module Impl {
 
   private Element getImmediateChildOfConst(Const e, int index, string partialPredicateCall) {
     exists(
-      int b, int bAssocItem, int bItem, int n, int nAttr, int nBody, int nName, int nTy,
+      int b, int bAssocItem, int bItem, int n, int nAttr, int nBody, int nName, int nTypeRepr,
       int nVisibility
     |
       b = 0 and
@@ -2897,8 +2938,8 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nBody = nAttr + 1 and
       nName = nBody + 1 and
-      nTy = nName + 1 and
-      nVisibility = nTy + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
       (
         none()
         or
@@ -2913,9 +2954,9 @@ private module Impl {
         or
         index = nBody and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
@@ -3318,7 +3359,7 @@ private module Impl {
 
   private Element getImmediateChildOfStatic(Static e, int index, string partialPredicateCall) {
     exists(
-      int b, int bExternItem, int bItem, int n, int nAttr, int nBody, int nName, int nTy,
+      int b, int bExternItem, int bItem, int n, int nAttr, int nBody, int nName, int nTypeRepr,
       int nVisibility
     |
       b = 0 and
@@ -3329,8 +3370,8 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nBody = nAttr + 1 and
       nName = nBody + 1 and
-      nTy = nName + 1 and
-      nVisibility = nTy + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
       (
         none()
         or
@@ -3345,9 +3386,9 @@ private module Impl {
         or
         index = nBody and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
@@ -3479,7 +3520,7 @@ private module Impl {
   private Element getImmediateChildOfTypeAlias(TypeAlias e, int index, string partialPredicateCall) {
     exists(
       int b, int bAssocItem, int bExternItem, int bItem, int n, int nAttr, int nGenericParamList,
-      int nName, int nTy, int nTypeBoundList, int nVisibility, int nWhereClause
+      int nName, int nTypeRepr, int nTypeBoundList, int nVisibility, int nWhereClause
     |
       b = 0 and
       bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
@@ -3490,8 +3531,8 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
-      nTy = nName + 1 and
-      nTypeBoundList = nTy + 1 and
+      nTypeRepr = nName + 1 and
+      nTypeBoundList = nTypeRepr + 1 and
       nVisibility = nTypeBoundList + 1 and
       nWhereClause = nVisibility + 1 and
       (
@@ -3512,9 +3553,11 @@ private module Impl {
         or
         index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        index = nTypeRepr and
+        result = e.getTypeBoundList() and
+        partialPredicateCall = "TypeBoundList()"
         or
         index = nTypeBoundList and
         result = e.getVisibility() and
@@ -3728,7 +3771,7 @@ private module Impl {
     or
     result = getImmediateChildOfRename(e, index, partialAccessor)
     or
-    result = getImmediateChildOfRetType(e, index, partialAccessor)
+    result = getImmediateChildOfRetTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfReturnTypeSyntax(e, index, partialAccessor)
     or
@@ -3758,7 +3801,7 @@ private module Impl {
     or
     result = getImmediateChildOfArrayExprInternal(e, index, partialAccessor)
     or
-    result = getImmediateChildOfArrayType(e, index, partialAccessor)
+    result = getImmediateChildOfArrayTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
     or
@@ -3788,15 +3831,15 @@ private module Impl {
     or
     result = getImmediateChildOfContinueExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfDynTraitType(e, index, partialAccessor)
+    result = getImmediateChildOfDynTraitTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfExprStmt(e, index, partialAccessor)
     or
     result = getImmediateChildOfFieldExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfFnPtrType(e, index, partialAccessor)
+    result = getImmediateChildOfFnPtrTypeRepr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfForType(e, index, partialAccessor)
+    result = getImmediateChildOfForTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfFormatArgsExpr(e, index, partialAccessor)
     or
@@ -3804,11 +3847,11 @@ private module Impl {
     or
     result = getImmediateChildOfIfExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfImplTraitType(e, index, partialAccessor)
+    result = getImmediateChildOfImplTraitTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfIndexExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfInferType(e, index, partialAccessor)
+    result = getImmediateChildOfInferTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfLetExpr(e, index, partialAccessor)
     or
@@ -3826,11 +3869,11 @@ private module Impl {
     or
     result = getImmediateChildOfMacroPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMacroType(e, index, partialAccessor)
+    result = getImmediateChildOfMacroTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfMatchExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfNeverType(e, index, partialAccessor)
+    result = getImmediateChildOfNeverTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfOffsetOfExpr(e, index, partialAccessor)
     or
@@ -3842,17 +3885,17 @@ private module Impl {
     or
     result = getImmediateChildOfParenPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfParenType(e, index, partialAccessor)
+    result = getImmediateChildOfParenTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfPath(e, index, partialAccessor)
     or
     result = getImmediateChildOfPathPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfPathType(e, index, partialAccessor)
+    result = getImmediateChildOfPathTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfPrefixExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfPtrType(e, index, partialAccessor)
+    result = getImmediateChildOfPtrTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfRangeExpr(e, index, partialAccessor)
     or
@@ -3868,7 +3911,7 @@ private module Impl {
     or
     result = getImmediateChildOfRefPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfRefType(e, index, partialAccessor)
+    result = getImmediateChildOfRefTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfRestPat(e, index, partialAccessor)
     or
@@ -3878,7 +3921,7 @@ private module Impl {
     or
     result = getImmediateChildOfSlicePat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfSliceType(e, index, partialAccessor)
+    result = getImmediateChildOfSliceTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTryExpr(e, index, partialAccessor)
     or
@@ -3890,7 +3933,7 @@ private module Impl {
     or
     result = getImmediateChildOfTupleStructPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfTupleType(e, index, partialAccessor)
+    result = getImmediateChildOfTupleTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTypeArg(e, index, partialAccessor)
     or
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
index 562747d0f111..d0c3f7e82aaf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
@@ -21,7 +21,7 @@ module Generated {
    * let x = variable;
    * let x = foo::bar;
    * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
+   * let z = <TypeRepr as Trait>::foo;
    * ```
    * INTERNAL: Do not reference the `Generated::PathExpr` class directly.
    * Use the subclass `PathExpr`, where the following predicates are available.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
index f91949de40e6..f1d3beafeb99 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
@@ -29,7 +29,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "PathPat" }
 
     /**
-     * Gets the path of this path pat, if it exists.
+     * Gets the path of this path pattern, if it exists.
      */
     Path getPath() {
       result = Synth::convertPathFromRaw(Synth::convertPathPatToRaw(this).(Raw::PathPat).getPath())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
index a2c3b970df68..ada03f52345a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
@@ -10,10 +10,10 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.ParamList
-import codeql.rust.elements.PathType
-import codeql.rust.elements.RetType
+import codeql.rust.elements.PathTypeRepr
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnTypeSyntax
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `PathSegment` and should not
@@ -76,9 +76,9 @@ module Generated {
     /**
      * Gets the path type of this path segment, if it exists.
      */
-    PathType getPathType() {
+    PathTypeRepr getPathType() {
       result =
-        Synth::convertPathTypeFromRaw(Synth::convertPathSegmentToRaw(this)
+        Synth::convertPathTypeReprFromRaw(Synth::convertPathSegmentToRaw(this)
               .(Raw::PathSegment)
               .getPathType())
     }
@@ -91,9 +91,9 @@ module Generated {
     /**
      * Gets the ret type of this path segment, if it exists.
      */
-    RetType getRetType() {
+    RetTypeRepr getRetType() {
       result =
-        Synth::convertRetTypeFromRaw(Synth::convertPathSegmentToRaw(this)
+        Synth::convertRetTypeReprFromRaw(Synth::convertPathSegmentToRaw(this)
               .(Raw::PathSegment)
               .getRetType())
     }
@@ -119,16 +119,18 @@ module Generated {
     final predicate hasReturnTypeSyntax() { exists(this.getReturnTypeSyntax()) }
 
     /**
-     * Gets the ty of this path segment, if it exists.
+     * Gets the type representation of this path segment, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertPathSegmentToRaw(this).(Raw::PathSegment).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll
similarity index 50%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll
index 13d7957c40e0..8195ded45ee1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll
@@ -1,16 +1,16 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `PathType`.
+ * This module provides the generated definition of `PathTypeRepr`.
  * INTERNAL: Do not import directly.
  */
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Path
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
 
 /**
- * INTERNAL: This module contains the fully generated definition of `PathType` and should not
+ * INTERNAL: This module contains the fully generated definition of `PathTypeRepr` and should not
  * be referenced directly.
  */
 module Generated {
@@ -20,18 +20,20 @@ module Generated {
    * type X = std::collections::HashMap<i32, i32>;
    * type Y = X::Item;
    * ```
-   * INTERNAL: Do not reference the `Generated::PathType` class directly.
-   * Use the subclass `PathType`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::PathTypeRepr` class directly.
+   * Use the subclass `PathTypeRepr`, where the following predicates are available.
    */
-  class PathType extends Synth::TPathType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "PathType" }
+  class PathTypeRepr extends Synth::TPathTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "PathTypeRepr" }
 
     /**
-     * Gets the path of this path type, if it exists.
+     * Gets the path of this path type representation, if it exists.
      */
     Path getPath() {
       result =
-        Synth::convertPathFromRaw(Synth::convertPathTypeToRaw(this).(Raw::PathType).getPath())
+        Synth::convertPathFromRaw(Synth::convertPathTypeReprToRaw(this)
+              .(Raw::PathTypeRepr)
+              .getPath())
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
deleted file mode 100644
index 598052d09d5f..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
+++ /dev/null
@@ -1,50 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `PtrType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `PtrType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A PtrType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::PtrType` class directly.
-   * Use the subclass `PtrType`, where the following predicates are available.
-   */
-  class PtrType extends Synth::TPtrType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "PtrType" }
-
-    /**
-     * Holds if this ptr type is const.
-     */
-    predicate isConst() { Synth::convertPtrTypeToRaw(this).(Raw::PtrType).isConst() }
-
-    /**
-     * Holds if this ptr type is mut.
-     */
-    predicate isMut() { Synth::convertPtrTypeToRaw(this).(Raw::PtrType).isMut() }
-
-    /**
-     * Gets the ty of this ptr type, if it exists.
-     */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertPtrTypeToRaw(this).(Raw::PtrType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll
new file mode 100644
index 000000000000..609c8d258c49
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll
@@ -0,0 +1,53 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PtrTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PtrTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A PtrTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::PtrTypeRepr` class directly.
+   * Use the subclass `PtrTypeRepr`, where the following predicates are available.
+   */
+  class PtrTypeRepr extends Synth::TPtrTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "PtrTypeRepr" }
+
+    /**
+     * Holds if this ptr type representation is const.
+     */
+    predicate isConst() { Synth::convertPtrTypeReprToRaw(this).(Raw::PtrTypeRepr).isConst() }
+
+    /**
+     * Holds if this ptr type representation is mut.
+     */
+    predicate isMut() { Synth::convertPtrTypeReprToRaw(this).(Raw::PtrTypeRepr).isMut() }
+
+    /**
+     * Gets the type representation of this ptr type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertPtrTypeReprToRaw(this)
+              .(Raw::PtrTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
index 2d78268e4248..60ea7b90fd7d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
@@ -30,7 +30,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RangePat" }
 
     /**
-     * Gets the end of this range pat, if it exists.
+     * Gets the end of this range pattern, if it exists.
      */
     Pat getEnd() {
       result = Synth::convertPatFromRaw(Synth::convertRangePatToRaw(this).(Raw::RangePat).getEnd())
@@ -42,7 +42,7 @@ module Generated {
     final predicate hasEnd() { exists(this.getEnd()) }
 
     /**
-     * Gets the operator name of this range pat, if it exists.
+     * Gets the operator name of this range pattern, if it exists.
      */
     string getOperatorName() {
       result = Synth::convertRangePatToRaw(this).(Raw::RangePat).getOperatorName()
@@ -54,7 +54,7 @@ module Generated {
     final predicate hasOperatorName() { exists(this.getOperatorName()) }
 
     /**
-     * Gets the start of this range pat, if it exists.
+     * Gets the start of this range pattern, if it exists.
      */
     Pat getStart() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index 078fb6429991..03d9f253a60f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -442,7 +442,7 @@ module Raw {
     MatchGuard getGuard() { match_arm_guards(this, result) }
 
     /**
-     * Gets the pat of this match arm, if it exists.
+     * Gets the pattern of this match arm, if it exists.
      */
     Pat getPat() { match_arm_pats(this, result) }
   }
@@ -558,9 +558,9 @@ module Raw {
     Attr getAttr(int index) { param_base_attrs(this, index, result) }
 
     /**
-     * Gets the ty of this parameter base, if it exists.
+     * Gets the type representation of this parameter base, if it exists.
      */
-    TypeRef getTy() { param_base_ties(this, result) }
+    TypeRepr getTypeRepr() { param_base_type_reprs(this, result) }
   }
 
   /**
@@ -615,12 +615,12 @@ module Raw {
     /**
      * Gets the path type of this path segment, if it exists.
      */
-    PathType getPathType() { path_segment_path_types(this, result) }
+    PathTypeRepr getPathType() { path_segment_path_types(this, result) }
 
     /**
      * Gets the ret type of this path segment, if it exists.
      */
-    RetType getRetType() { path_segment_ret_types(this, result) }
+    RetTypeRepr getRetType() { path_segment_ret_types(this, result) }
 
     /**
      * Gets the return type syntax of this path segment, if it exists.
@@ -628,9 +628,9 @@ module Raw {
     ReturnTypeSyntax getReturnTypeSyntax() { path_segment_return_type_syntaxes(this, result) }
 
     /**
-     * Gets the ty of this path segment, if it exists.
+     * Gets the type representation of this path segment, if it exists.
      */
-    TypeRef getTy() { path_segment_ties(this, result) }
+    TypeRepr getTypeRepr() { path_segment_type_reprs(this, result) }
   }
 
   /**
@@ -706,9 +706,9 @@ module Raw {
     Name getName() { record_field_names(this, result) }
 
     /**
-     * Gets the ty of this record field, if it exists.
+     * Gets the type representation of this record field, if it exists.
      */
-    TypeRef getTy() { record_field_ties(this, result) }
+    TypeRepr getTypeRepr() { record_field_type_reprs(this, result) }
 
     /**
      * Gets the visibility of this record field, if it exists.
@@ -727,17 +727,17 @@ module Raw {
     override string toString() { result = "RecordPatField" }
 
     /**
-     * Gets the `index`th attr of this record pat field (0-based).
+     * Gets the `index`th attr of this record pattern field (0-based).
      */
     Attr getAttr(int index) { record_pat_field_attrs(this, index, result) }
 
     /**
-     * Gets the name reference of this record pat field, if it exists.
+     * Gets the name reference of this record pattern field, if it exists.
      */
     NameRef getNameRef() { record_pat_field_name_refs(this, result) }
 
     /**
-     * Gets the pat of this record pat field, if it exists.
+     * Gets the pattern of this record pattern field, if it exists.
      */
     Pat getPat() { record_pat_field_pats(this, result) }
   }
@@ -753,12 +753,12 @@ module Raw {
     override string toString() { result = "RecordPatFieldList" }
 
     /**
-     * Gets the `index`th field of this record pat field list (0-based).
+     * Gets the `index`th field of this record pattern field list (0-based).
      */
     RecordPatField getField(int index) { record_pat_field_list_fields(this, index, result) }
 
     /**
-     * Gets the rest pat of this record pat field list, if it exists.
+     * Gets the rest pattern of this record pattern field list, if it exists.
      */
     RestPat getRestPat() { record_pat_field_list_rest_pats(this, result) }
   }
@@ -797,18 +797,18 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A RetType. For example:
+   * A RetTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class RetType extends @ret_type, AstNode {
-    override string toString() { result = "RetType" }
+  class RetTypeRepr extends @ret_type_repr, AstNode {
+    override string toString() { result = "RetTypeRepr" }
 
     /**
-     * Gets the ty of this ret type, if it exists.
+     * Gets the type representation of this ret type representation, if it exists.
      */
-    TypeRef getTy() { ret_type_ties(this, result) }
+    TypeRepr getTypeRepr() { ret_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -908,9 +908,9 @@ module Raw {
     Attr getAttr(int index) { tuple_field_attrs(this, index, result) }
 
     /**
-     * Gets the ty of this tuple field, if it exists.
+     * Gets the type representation of this tuple field, if it exists.
      */
-    TypeRef getTy() { tuple_field_ties(this, result) }
+    TypeRepr getTypeRepr() { tuple_field_type_reprs(this, result) }
 
     /**
      * Gets the visibility of this tuple field, if it exists.
@@ -949,9 +949,9 @@ module Raw {
     Lifetime getLifetime() { type_bound_lifetimes(this, result) }
 
     /**
-     * Gets the ty of this type bound, if it exists.
+     * Gets the type representation of this type bound, if it exists.
      */
-    TypeRef getTy() { type_bound_ties(this, result) }
+    TypeRepr getTypeRepr() { type_bound_type_reprs(this, result) }
   }
 
   /**
@@ -979,7 +979,7 @@ module Raw {
    * let z: Option<i32>;
    * ```
    */
-  class TypeRef extends @type_ref, AstNode { }
+  class TypeRepr extends @type_repr, AstNode { }
 
   /**
    * INTERNAL: Do not use.
@@ -1092,9 +1092,9 @@ module Raw {
     Lifetime getLifetime() { where_pred_lifetimes(this, result) }
 
     /**
-     * Gets the ty of this where pred, if it exists.
+     * Gets the type representation of this where pred, if it exists.
      */
-    TypeRef getTy() { where_pred_ties(this, result) }
+    TypeRepr getTypeRepr() { where_pred_type_reprs(this, result) }
 
     /**
      * Gets the type bound list of this where pred, if it exists.
@@ -1126,23 +1126,23 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A ArrayType. For example:
+   * A ArrayTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ArrayType extends @array_type, TypeRef {
-    override string toString() { result = "ArrayType" }
+  class ArrayTypeRepr extends @array_type_repr, TypeRepr {
+    override string toString() { result = "ArrayTypeRepr" }
 
     /**
-     * Gets the const argument of this array type, if it exists.
+     * Gets the const argument of this array type representation, if it exists.
      */
-    ConstArg getConstArg() { array_type_const_args(this, result) }
+    ConstArg getConstArg() { array_type_repr_const_args(this, result) }
 
     /**
-     * Gets the ty of this array type, if it exists.
+     * Gets the element type representation of this array type representation, if it exists.
      */
-    TypeRef getTy() { array_type_ties(this, result) }
+    TypeRepr getElementTypeRepr() { array_type_repr_element_type_reprs(this, result) }
   }
 
   /**
@@ -1201,7 +1201,7 @@ module Raw {
     /**
      * Gets the ret type of this assoc type argument, if it exists.
      */
-    RetType getRetType() { assoc_type_arg_ret_types(this, result) }
+    RetTypeRepr getRetType() { assoc_type_arg_ret_types(this, result) }
 
     /**
      * Gets the return type syntax of this assoc type argument, if it exists.
@@ -1209,9 +1209,9 @@ module Raw {
     ReturnTypeSyntax getReturnTypeSyntax() { assoc_type_arg_return_type_syntaxes(this, result) }
 
     /**
-     * Gets the ty of this assoc type argument, if it exists.
+     * Gets the type representation of this assoc type argument, if it exists.
      */
-    TypeRef getTy() { assoc_type_arg_ties(this, result) }
+    TypeRepr getTypeRepr() { assoc_type_arg_type_reprs(this, result) }
 
     /**
      * Gets the type bound list of this assoc type argument, if it exists.
@@ -1319,7 +1319,7 @@ module Raw {
     override string toString() { result = "BoxPat" }
 
     /**
-     * Gets the pat of this box pat, if it exists.
+     * Gets the pattern of this box pattern, if it exists.
      */
     Pat getPat() { box_pat_pats(this, result) }
   }
@@ -1406,9 +1406,9 @@ module Raw {
     Expr getExpr() { cast_expr_exprs(this, result) }
 
     /**
-     * Gets the ty of this cast expression, if it exists.
+     * Gets the type representation of this cast expression, if it exists.
      */
-    TypeRef getTy() { cast_expr_ties(this, result) }
+    TypeRepr getTypeRepr() { cast_expr_type_reprs(this, result) }
   }
 
   /**
@@ -1465,7 +1465,7 @@ module Raw {
     /**
      * Gets the ret type of this closure expression, if it exists.
      */
-    RetType getRetType() { closure_expr_ret_types(this, result) }
+    RetTypeRepr getRetType() { closure_expr_ret_types(this, result) }
   }
 
   /**
@@ -1520,12 +1520,12 @@ module Raw {
     override string toString() { result = "ConstBlockPat" }
 
     /**
-     * Gets the block expression of this const block pat, if it exists.
+     * Gets the block expression of this const block pattern, if it exists.
      */
     BlockExpr getBlockExpr() { const_block_pat_block_exprs(this, result) }
 
     /**
-     * Holds if this const block pat is const.
+     * Holds if this const block pattern is const.
      */
     predicate isConst() { const_block_pat_is_const(this) }
   }
@@ -1561,9 +1561,9 @@ module Raw {
     Name getName() { const_param_names(this, result) }
 
     /**
-     * Gets the ty of this const parameter, if it exists.
+     * Gets the type representation of this const parameter, if it exists.
      */
-    TypeRef getTy() { const_param_ties(this, result) }
+    TypeRepr getTypeRepr() { const_param_type_reprs(this, result) }
   }
 
   /**
@@ -1600,18 +1600,18 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A DynTraitType. For example:
+   * A DynTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class DynTraitType extends @dyn_trait_type, TypeRef {
-    override string toString() { result = "DynTraitType" }
+  class DynTraitTypeRepr extends @dyn_trait_type_repr, TypeRepr {
+    override string toString() { result = "DynTraitTypeRepr" }
 
     /**
-     * Gets the type bound list of this dyn trait type, if it exists.
+     * Gets the type bound list of this dyn trait type representation, if it exists.
      */
-    TypeBoundList getTypeBoundList() { dyn_trait_type_type_bound_lists(this, result) }
+    TypeBoundList getTypeBoundList() { dyn_trait_type_repr_type_bound_lists(this, result) }
   }
 
   /**
@@ -1660,64 +1660,64 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A FnPtrType. For example:
+   * A FnPtrTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class FnPtrType extends @fn_ptr_type, TypeRef {
-    override string toString() { result = "FnPtrType" }
+  class FnPtrTypeRepr extends @fn_ptr_type_repr, TypeRepr {
+    override string toString() { result = "FnPtrTypeRepr" }
 
     /**
-     * Gets the abi of this fn ptr type, if it exists.
+     * Gets the abi of this fn ptr type representation, if it exists.
      */
-    Abi getAbi() { fn_ptr_type_abis(this, result) }
+    Abi getAbi() { fn_ptr_type_repr_abis(this, result) }
 
     /**
-     * Holds if this fn ptr type is async.
+     * Holds if this fn ptr type representation is async.
      */
-    predicate isAsync() { fn_ptr_type_is_async(this) }
+    predicate isAsync() { fn_ptr_type_repr_is_async(this) }
 
     /**
-     * Holds if this fn ptr type is const.
+     * Holds if this fn ptr type representation is const.
      */
-    predicate isConst() { fn_ptr_type_is_const(this) }
+    predicate isConst() { fn_ptr_type_repr_is_const(this) }
 
     /**
-     * Holds if this fn ptr type is unsafe.
+     * Holds if this fn ptr type representation is unsafe.
      */
-    predicate isUnsafe() { fn_ptr_type_is_unsafe(this) }
+    predicate isUnsafe() { fn_ptr_type_repr_is_unsafe(this) }
 
     /**
-     * Gets the parameter list of this fn ptr type, if it exists.
+     * Gets the parameter list of this fn ptr type representation, if it exists.
      */
-    ParamList getParamList() { fn_ptr_type_param_lists(this, result) }
+    ParamList getParamList() { fn_ptr_type_repr_param_lists(this, result) }
 
     /**
-     * Gets the ret type of this fn ptr type, if it exists.
+     * Gets the ret type of this fn ptr type representation, if it exists.
      */
-    RetType getRetType() { fn_ptr_type_ret_types(this, result) }
+    RetTypeRepr getRetType() { fn_ptr_type_repr_ret_types(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A ForType. For example:
+   * A ForTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ForType extends @for_type, TypeRef {
-    override string toString() { result = "ForType" }
+  class ForTypeRepr extends @for_type_repr, TypeRepr {
+    override string toString() { result = "ForTypeRepr" }
 
     /**
-     * Gets the generic parameter list of this for type, if it exists.
+     * Gets the generic parameter list of this for type representation, if it exists.
      */
-    GenericParamList getGenericParamList() { for_type_generic_param_lists(this, result) }
+    GenericParamList getGenericParamList() { for_type_repr_generic_param_lists(this, result) }
 
     /**
-     * Gets the ty of this for type, if it exists.
+     * Gets the type representation of this for type representation, if it exists.
      */
-    TypeRef getTy() { for_type_ties(this, result) }
+    TypeRepr getTypeRepr() { for_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -1770,27 +1770,27 @@ module Raw {
     override string toString() { result = "IdentPat" }
 
     /**
-     * Gets the `index`th attr of this ident pat (0-based).
+     * Gets the `index`th attr of this ident pattern (0-based).
      */
     Attr getAttr(int index) { ident_pat_attrs(this, index, result) }
 
     /**
-     * Holds if this ident pat is mut.
+     * Holds if this ident pattern is mut.
      */
     predicate isMut() { ident_pat_is_mut(this) }
 
     /**
-     * Holds if this ident pat is reference.
+     * Holds if this ident pattern is reference.
      */
     predicate isRef() { ident_pat_is_ref(this) }
 
     /**
-     * Gets the name of this ident pat, if it exists.
+     * Gets the name of this ident pattern, if it exists.
      */
     Name getName() { ident_pat_names(this, result) }
 
     /**
-     * Gets the pat of this ident pat, if it exists.
+     * Gets the pattern of this ident pattern, if it exists.
      */
     Pat getPat() { ident_pat_pats(this, result) }
   }
@@ -1837,18 +1837,18 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A ImplTraitType. For example:
+   * A ImplTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ImplTraitType extends @impl_trait_type, TypeRef {
-    override string toString() { result = "ImplTraitType" }
+  class ImplTraitTypeRepr extends @impl_trait_type_repr, TypeRepr {
+    override string toString() { result = "ImplTraitTypeRepr" }
 
     /**
-     * Gets the type bound list of this impl trait type, if it exists.
+     * Gets the type bound list of this impl trait type representation, if it exists.
      */
-    TypeBoundList getTypeBoundList() { impl_trait_type_type_bound_lists(this, result) }
+    TypeBoundList getTypeBoundList() { impl_trait_type_repr_type_bound_lists(this, result) }
   }
 
   /**
@@ -1880,13 +1880,13 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A InferType. For example:
+   * A InferTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class InferType extends @infer_type, TypeRef {
-    override string toString() { result = "InferType" }
+  class InferTypeRepr extends @infer_type_repr, TypeRepr {
+    override string toString() { result = "InferTypeRepr" }
   }
 
   /**
@@ -1932,7 +1932,7 @@ module Raw {
     Expr getScrutinee() { let_expr_scrutinees(this, result) }
 
     /**
-     * Gets the pat of this let expression, if it exists.
+     * Gets the pattern of this let expression, if it exists.
      */
     Pat getPat() { let_expr_pats(this, result) }
   }
@@ -1970,14 +1970,14 @@ module Raw {
     LetElse getLetElse() { let_stmt_let_elses(this, result) }
 
     /**
-     * Gets the pat of this let statement, if it exists.
+     * Gets the pattern of this let statement, if it exists.
      */
     Pat getPat() { let_stmt_pats(this, result) }
 
     /**
-     * Gets the ty of this let statement, if it exists.
+     * Gets the type representation of this let statement, if it exists.
      */
-    TypeRef getTy() { let_stmt_ties(this, result) }
+    TypeRepr getTypeRepr() { let_stmt_type_reprs(this, result) }
   }
 
   /**
@@ -2064,7 +2064,7 @@ module Raw {
     override string toString() { result = "LiteralPat" }
 
     /**
-     * Gets the literal of this literal pat, if it exists.
+     * Gets the literal of this literal pattern, if it exists.
      */
     LiteralExpr getLiteral() { literal_pat_literals(this, result) }
   }
@@ -2096,25 +2096,25 @@ module Raw {
     override string toString() { result = "MacroPat" }
 
     /**
-     * Gets the macro call of this macro pat, if it exists.
+     * Gets the macro call of this macro pattern, if it exists.
      */
     MacroCall getMacroCall() { macro_pat_macro_calls(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A MacroType. For example:
+   * A MacroTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class MacroType extends @macro_type, TypeRef {
-    override string toString() { result = "MacroType" }
+  class MacroTypeRepr extends @macro_type_repr, TypeRepr {
+    override string toString() { result = "MacroTypeRepr" }
 
     /**
-     * Gets the macro call of this macro type, if it exists.
+     * Gets the macro call of this macro type representation, if it exists.
      */
-    MacroCall getMacroCall() { macro_type_macro_calls(this, result) }
+    MacroCall getMacroCall() { macro_type_repr_macro_calls(this, result) }
   }
 
   /**
@@ -2154,13 +2154,13 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A NeverType. For example:
+   * A NeverTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class NeverType extends @never_type, TypeRef {
-    override string toString() { result = "NeverType" }
+  class NeverTypeRepr extends @never_type_repr, TypeRepr {
+    override string toString() { result = "NeverTypeRepr" }
   }
 
   /**
@@ -2184,9 +2184,9 @@ module Raw {
     NameRef getField(int index) { offset_of_expr_fields(this, index, result) }
 
     /**
-     * Gets the ty of this offset of expression, if it exists.
+     * Gets the type representation of this offset of expression, if it exists.
      */
-    TypeRef getTy() { offset_of_expr_ties(this, result) }
+    TypeRepr getTypeRepr() { offset_of_expr_type_reprs(this, result) }
   }
 
   /**
@@ -2202,7 +2202,7 @@ module Raw {
     override string toString() { result = "OrPat" }
 
     /**
-     * Gets the `index`th pat of this or pat (0-based).
+     * Gets the `index`th pattern of this or pattern (0-based).
      */
     Pat getPat(int index) { or_pat_pats(this, index, result) }
   }
@@ -2220,7 +2220,7 @@ module Raw {
     override string toString() { result = "Param" }
 
     /**
-     * Gets the pat of this parameter, if it exists.
+     * Gets the pattern of this parameter, if it exists.
      */
     Pat getPat() { param_pats(this, result) }
   }
@@ -2257,25 +2257,25 @@ module Raw {
     override string toString() { result = "ParenPat" }
 
     /**
-     * Gets the pat of this paren pat, if it exists.
+     * Gets the pattern of this paren pattern, if it exists.
      */
     Pat getPat() { paren_pat_pats(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A ParenType. For example:
+   * A ParenTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ParenType extends @paren_type, TypeRef {
-    override string toString() { result = "ParenType" }
+  class ParenTypeRepr extends @paren_type_repr, TypeRepr {
+    override string toString() { result = "ParenTypeRepr" }
 
     /**
-     * Gets the ty of this paren type, if it exists.
+     * Gets the type representation of this paren type representation, if it exists.
      */
-    TypeRef getTy() { paren_type_ties(this, result) }
+    TypeRepr getTypeRepr() { paren_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -2320,7 +2320,7 @@ module Raw {
     override string toString() { result = "PathPat" }
 
     /**
-     * Gets the path of this path pat, if it exists.
+     * Gets the path of this path pattern, if it exists.
      */
     Path getPath() { path_pat_paths(this, result) }
   }
@@ -2333,13 +2333,13 @@ module Raw {
    * type Y = X::Item;
    * ```
    */
-  class PathType extends @path_type, TypeRef {
-    override string toString() { result = "PathType" }
+  class PathTypeRepr extends @path_type_repr, TypeRepr {
+    override string toString() { result = "PathTypeRepr" }
 
     /**
-     * Gets the path of this path type, if it exists.
+     * Gets the path of this path type representation, if it exists.
      */
-    Path getPath() { path_type_paths(this, result) }
+    Path getPath() { path_type_repr_paths(this, result) }
   }
 
   /**
@@ -2372,28 +2372,28 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A PtrType. For example:
+   * A PtrTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class PtrType extends @ptr_type, TypeRef {
-    override string toString() { result = "PtrType" }
+  class PtrTypeRepr extends @ptr_type_repr, TypeRepr {
+    override string toString() { result = "PtrTypeRepr" }
 
     /**
-     * Holds if this ptr type is const.
+     * Holds if this ptr type representation is const.
      */
-    predicate isConst() { ptr_type_is_const(this) }
+    predicate isConst() { ptr_type_repr_is_const(this) }
 
     /**
-     * Holds if this ptr type is mut.
+     * Holds if this ptr type representation is mut.
      */
-    predicate isMut() { ptr_type_is_mut(this) }
+    predicate isMut() { ptr_type_repr_is_mut(this) }
 
     /**
-     * Gets the ty of this ptr type, if it exists.
+     * Gets the type representation of this ptr type representation, if it exists.
      */
-    TypeRef getTy() { ptr_type_ties(this, result) }
+    TypeRepr getTypeRepr() { ptr_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -2447,17 +2447,17 @@ module Raw {
     override string toString() { result = "RangePat" }
 
     /**
-     * Gets the end of this range pat, if it exists.
+     * Gets the end of this range pattern, if it exists.
      */
     Pat getEnd() { range_pat_ends(this, result) }
 
     /**
-     * Gets the operator name of this range pat, if it exists.
+     * Gets the operator name of this range pattern, if it exists.
      */
     string getOperatorName() { range_pat_operator_names(this, result) }
 
     /**
-     * Gets the start of this range pat, if it exists.
+     * Gets the start of this range pattern, if it exists.
      */
     Pat getStart() { range_pat_starts(this, result) }
   }
@@ -2518,12 +2518,12 @@ module Raw {
     override string toString() { result = "RecordPat" }
 
     /**
-     * Gets the path of this record pat, if it exists.
+     * Gets the path of this record pattern, if it exists.
      */
     Path getPath() { record_pat_paths(this, result) }
 
     /**
-     * Gets the record pat field list of this record pat, if it exists.
+     * Gets the record pattern field list of this record pattern, if it exists.
      */
     RecordPatFieldList getRecordPatFieldList() { record_pat_record_pat_field_lists(this, result) }
   }
@@ -2581,40 +2581,40 @@ module Raw {
     override string toString() { result = "RefPat" }
 
     /**
-     * Holds if this reference pat is mut.
+     * Holds if this reference pattern is mut.
      */
     predicate isMut() { ref_pat_is_mut(this) }
 
     /**
-     * Gets the pat of this reference pat, if it exists.
+     * Gets the pattern of this reference pattern, if it exists.
      */
     Pat getPat() { ref_pat_pats(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A RefType. For example:
+   * A RefTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class RefType extends @ref_type, TypeRef {
-    override string toString() { result = "RefType" }
+  class RefTypeRepr extends @ref_type_repr, TypeRepr {
+    override string toString() { result = "RefTypeRepr" }
 
     /**
-     * Holds if this reference type is mut.
+     * Holds if this reference type representation is mut.
      */
-    predicate isMut() { ref_type_is_mut(this) }
+    predicate isMut() { ref_type_repr_is_mut(this) }
 
     /**
-     * Gets the lifetime of this reference type, if it exists.
+     * Gets the lifetime of this reference type representation, if it exists.
      */
-    Lifetime getLifetime() { ref_type_lifetimes(this, result) }
+    Lifetime getLifetime() { ref_type_repr_lifetimes(this, result) }
 
     /**
-     * Gets the ty of this reference type, if it exists.
+     * Gets the type representation of this reference type representation, if it exists.
      */
-    TypeRef getTy() { ref_type_ties(this, result) }
+    TypeRepr getTypeRepr() { ref_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -2628,7 +2628,7 @@ module Raw {
     override string toString() { result = "RestPat" }
 
     /**
-     * Gets the `index`th attr of this rest pat (0-based).
+     * Gets the `index`th attr of this rest pattern (0-based).
      */
     Attr getAttr(int index) { rest_pat_attrs(this, index, result) }
   }
@@ -2704,25 +2704,25 @@ module Raw {
     override string toString() { result = "SlicePat" }
 
     /**
-     * Gets the `index`th pat of this slice pat (0-based).
+     * Gets the `index`th pattern of this slice pattern (0-based).
      */
     Pat getPat(int index) { slice_pat_pats(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A SliceType. For example:
+   * A SliceTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class SliceType extends @slice_type, TypeRef {
-    override string toString() { result = "SliceType" }
+  class SliceTypeRepr extends @slice_type_repr, TypeRepr {
+    override string toString() { result = "SliceTypeRepr" }
 
     /**
-     * Gets the ty of this slice type, if it exists.
+     * Gets the type representation of this slice type representation, if it exists.
      */
-    TypeRef getTy() { slice_type_ties(this, result) }
+    TypeRepr getTypeRepr() { slice_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -2796,7 +2796,7 @@ module Raw {
     override string toString() { result = "TuplePat" }
 
     /**
-     * Gets the `index`th field of this tuple pat (0-based).
+     * Gets the `index`th field of this tuple pattern (0-based).
      */
     Pat getField(int index) { tuple_pat_fields(this, index, result) }
   }
@@ -2816,30 +2816,30 @@ module Raw {
     override string toString() { result = "TupleStructPat" }
 
     /**
-     * Gets the `index`th field of this tuple struct pat (0-based).
+     * Gets the `index`th field of this tuple struct pattern (0-based).
      */
     Pat getField(int index) { tuple_struct_pat_fields(this, index, result) }
 
     /**
-     * Gets the path of this tuple struct pat, if it exists.
+     * Gets the path of this tuple struct pattern, if it exists.
      */
     Path getPath() { tuple_struct_pat_paths(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A TupleType. For example:
+   * A TupleTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class TupleType extends @tuple_type, TypeRef {
-    override string toString() { result = "TupleType" }
+  class TupleTypeRepr extends @tuple_type_repr, TypeRepr {
+    override string toString() { result = "TupleTypeRepr" }
 
     /**
-     * Gets the `index`th field of this tuple type (0-based).
+     * Gets the `index`th field of this tuple type representation (0-based).
      */
-    TypeRef getField(int index) { tuple_type_fields(this, index, result) }
+    TypeRepr getField(int index) { tuple_type_repr_fields(this, index, result) }
   }
 
   /**
@@ -2853,9 +2853,9 @@ module Raw {
     override string toString() { result = "TypeArg" }
 
     /**
-     * Gets the ty of this type argument, if it exists.
+     * Gets the type representation of this type argument, if it exists.
      */
-    TypeRef getTy() { type_arg_ties(this, result) }
+    TypeRepr getTypeRepr() { type_arg_type_reprs(this, result) }
   }
 
   /**
@@ -2876,7 +2876,7 @@ module Raw {
     /**
      * Gets the default type of this type parameter, if it exists.
      */
-    TypeRef getDefaultType() { type_param_default_types(this, result) }
+    TypeRepr getDefaultType() { type_param_default_types(this, result) }
 
     /**
      * Gets the name of this type parameter, if it exists.
@@ -3113,9 +3113,9 @@ module Raw {
     Name getName() { const_names(this, result) }
 
     /**
-     * Gets the ty of this const, if it exists.
+     * Gets the type representation of this const, if it exists.
      */
-    TypeRef getTy() { const_ties(this, result) }
+    TypeRepr getTypeRepr() { const_type_reprs(this, result) }
 
     /**
      * Gets the visibility of this const, if it exists.
@@ -3290,7 +3290,7 @@ module Raw {
     /**
      * Gets the ret type of this function, if it exists.
      */
-    RetType getRetType() { function_ret_types(this, result) }
+    RetTypeRepr getRetType() { function_ret_types(this, result) }
 
     /**
      * Gets the visibility of this function, if it exists.
@@ -3346,12 +3346,12 @@ module Raw {
     /**
      * Gets the self ty of this impl, if it exists.
      */
-    TypeRef getSelfTy() { impl_self_ties(this, result) }
+    TypeRepr getSelfTy() { impl_self_ties(this, result) }
 
     /**
      * Gets the trait of this impl, if it exists.
      */
-    TypeRef getTrait() { impl_traits(this, result) }
+    TypeRepr getTrait() { impl_traits(this, result) }
 
     /**
      * Gets the visibility of this impl, if it exists.
@@ -3543,7 +3543,7 @@ module Raw {
    * let x = variable;
    * let x = foo::bar;
    * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
+   * let z = <TypeRepr as Trait>::foo;
    * ```
    */
   class PathExpr extends @path_expr, PathExprBase {
@@ -3596,9 +3596,9 @@ module Raw {
     Name getName() { static_names(this, result) }
 
     /**
-     * Gets the ty of this static, if it exists.
+     * Gets the type representation of this static, if it exists.
      */
-    TypeRef getTy() { static_ties(this, result) }
+    TypeRepr getTypeRepr() { static_type_reprs(this, result) }
 
     /**
      * Gets the visibility of this static, if it exists.
@@ -3781,9 +3781,9 @@ module Raw {
     Name getName() { type_alias_names(this, result) }
 
     /**
-     * Gets the ty of this type alias, if it exists.
+     * Gets the type representation of this type alias, if it exists.
      */
-    TypeRef getTy() { type_alias_ties(this, result) }
+    TypeRepr getTypeRepr() { type_alias_type_reprs(this, result) }
 
     /**
      * Gets the type bound list of this type alias, if it exists.
@@ -3889,7 +3889,7 @@ module Raw {
     Expr getIterable() { for_expr_iterables(this, result) }
 
     /**
-     * Gets the pat of this for expression, if it exists.
+     * Gets the pattern of this for expression, if it exists.
      */
     Pat getPat() { for_expr_pats(this, result) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
index c5fcb867b89b..aa840aafdcdf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
@@ -62,17 +62,19 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this record field, if it exists.
+     * Gets the type representation of this record field, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertRecordFieldToRaw(this).(Raw::RecordField).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertRecordFieldToRaw(this)
+              .(Raw::RecordField)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the visibility of this record field, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
index b4aa66a71a0d..2aa2abad28a9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
@@ -30,7 +30,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordPat" }
 
     /**
-     * Gets the path of this record pat, if it exists.
+     * Gets the path of this record pattern, if it exists.
      */
     Path getPath() {
       result =
@@ -43,7 +43,7 @@ module Generated {
     final predicate hasPath() { exists(this.getPath()) }
 
     /**
-     * Gets the record pat field list of this record pat, if it exists.
+     * Gets the record pattern field list of this record pattern, if it exists.
      */
     RecordPatFieldList getRecordPatFieldList() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
index 942df1972e40..557862754f26 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
@@ -28,7 +28,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordPatField" }
 
     /**
-     * Gets the `index`th attr of this record pat field (0-based).
+     * Gets the `index`th attr of this record pattern field (0-based).
      */
     Attr getAttr(int index) {
       result =
@@ -38,17 +38,17 @@ module Generated {
     }
 
     /**
-     * Gets any of the attrs of this record pat field.
+     * Gets any of the attrs of this record pattern field.
      */
     final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of attrs of this record pat field.
+     * Gets the number of attrs of this record pattern field.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the name reference of this record pat field, if it exists.
+     * Gets the name reference of this record pattern field, if it exists.
      */
     NameRef getNameRef() {
       result =
@@ -63,7 +63,7 @@ module Generated {
     final predicate hasNameRef() { exists(this.getNameRef()) }
 
     /**
-     * Gets the pat of this record pat field, if it exists.
+     * Gets the pattern of this record pattern field, if it exists.
      */
     Pat getPat() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
index 452207977062..e7733f22f342 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
@@ -27,7 +27,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordPatFieldList" }
 
     /**
-     * Gets the `index`th field of this record pat field list (0-based).
+     * Gets the `index`th field of this record pattern field list (0-based).
      */
     RecordPatField getField(int index) {
       result =
@@ -37,17 +37,17 @@ module Generated {
     }
 
     /**
-     * Gets any of the fields of this record pat field list.
+     * Gets any of the fields of this record pattern field list.
      */
     final RecordPatField getAField() { result = this.getField(_) }
 
     /**
-     * Gets the number of fields of this record pat field list.
+     * Gets the number of fields of this record pattern field list.
      */
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
 
     /**
-     * Gets the rest pat of this record pat field list, if it exists.
+     * Gets the rest pattern of this record pattern field list, if it exists.
      */
     RestPat getRestPat() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
index 197030ea1cbf..b954663a2dbf 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
@@ -29,12 +29,12 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RefPat" }
 
     /**
-     * Holds if this reference pat is mut.
+     * Holds if this reference pattern is mut.
      */
     predicate isMut() { Synth::convertRefPatToRaw(this).(Raw::RefPat).isMut() }
 
     /**
-     * Gets the pat of this reference pat, if it exists.
+     * Gets the pattern of this reference pattern, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertRefPatToRaw(this).(Raw::RefPat).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
deleted file mode 100644
index ce0bbf1e416e..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
+++ /dev/null
@@ -1,59 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RefType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Lifetime
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RefType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A RefType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::RefType` class directly.
-   * Use the subclass `RefType`, where the following predicates are available.
-   */
-  class RefType extends Synth::TRefType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "RefType" }
-
-    /**
-     * Holds if this reference type is mut.
-     */
-    predicate isMut() { Synth::convertRefTypeToRaw(this).(Raw::RefType).isMut() }
-
-    /**
-     * Gets the lifetime of this reference type, if it exists.
-     */
-    Lifetime getLifetime() {
-      result =
-        Synth::convertLifetimeFromRaw(Synth::convertRefTypeToRaw(this).(Raw::RefType).getLifetime())
-    }
-
-    /**
-     * Holds if `getLifetime()` exists.
-     */
-    final predicate hasLifetime() { exists(this.getLifetime()) }
-
-    /**
-     * Gets the ty of this reference type, if it exists.
-     */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertRefTypeToRaw(this).(Raw::RefType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll
new file mode 100644
index 000000000000..6c013f9356d8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll
@@ -0,0 +1,64 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RefTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RefTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RefTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RefTypeRepr` class directly.
+   * Use the subclass `RefTypeRepr`, where the following predicates are available.
+   */
+  class RefTypeRepr extends Synth::TRefTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "RefTypeRepr" }
+
+    /**
+     * Holds if this reference type representation is mut.
+     */
+    predicate isMut() { Synth::convertRefTypeReprToRaw(this).(Raw::RefTypeRepr).isMut() }
+
+    /**
+     * Gets the lifetime of this reference type representation, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertRefTypeReprToRaw(this)
+              .(Raw::RefTypeRepr)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the type representation of this reference type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertRefTypeReprToRaw(this)
+              .(Raw::RefTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
index 055c6476f4c4..06d2947ee8a5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
@@ -26,7 +26,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RestPat" }
 
     /**
-     * Gets the `index`th attr of this rest pat (0-based).
+     * Gets the `index`th attr of this rest pattern (0-based).
      */
     Attr getAttr(int index) {
       result =
@@ -34,12 +34,12 @@ module Generated {
     }
 
     /**
-     * Gets any of the attrs of this rest pat.
+     * Gets any of the attrs of this rest pattern.
      */
     final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of attrs of this rest pat.
+     * Gets the number of attrs of this rest pattern.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll
deleted file mode 100644
index 3b916d7d20de..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll
+++ /dev/null
@@ -1,40 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RetType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RetType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A RetType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::RetType` class directly.
-   * Use the subclass `RetType`, where the following predicates are available.
-   */
-  class RetType extends Synth::TRetType, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "RetType" }
-
-    /**
-     * Gets the ty of this ret type, if it exists.
-     */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertRetTypeToRaw(this).(Raw::RetType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
new file mode 100644
index 000000000000..352f4bcb9602
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RetTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RetTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RetTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RetTypeRepr` class directly.
+   * Use the subclass `RetTypeRepr`, where the following predicates are available.
+   */
+  class RetTypeRepr extends Synth::TRetTypeRepr, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RetTypeRepr" }
+
+    /**
+     * Gets the type representation of this ret type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertRetTypeReprToRaw(this)
+              .(Raw::RetTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
index 1f54445a6598..2a2521248722 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
@@ -30,7 +30,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "SlicePat" }
 
     /**
-     * Gets the `index`th pat of this slice pat (0-based).
+     * Gets the `index`th pattern of this slice pattern (0-based).
      */
     Pat getPat(int index) {
       result =
@@ -38,12 +38,12 @@ module Generated {
     }
 
     /**
-     * Gets any of the pats of this slice pat.
+     * Gets any of the patterns of this slice pattern.
      */
     final Pat getAPat() { result = this.getPat(_) }
 
     /**
-     * Gets the number of pats of this slice pat.
+     * Gets the number of patterns of this slice pattern.
      */
     final int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll
deleted file mode 100644
index 5576f34e13d6..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll
+++ /dev/null
@@ -1,41 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `SliceType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `SliceType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A SliceType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::SliceType` class directly.
-   * Use the subclass `SliceType`, where the following predicates are available.
-   */
-  class SliceType extends Synth::TSliceType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "SliceType" }
-
-    /**
-     * Gets the ty of this slice type, if it exists.
-     */
-    TypeRef getTy() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertSliceTypeToRaw(this).(Raw::SliceType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll
new file mode 100644
index 000000000000..6d47596b7d72
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `SliceTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `SliceTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A SliceTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::SliceTypeRepr` class directly.
+   * Use the subclass `SliceTypeRepr`, where the following predicates are available.
+   */
+  class SliceTypeRepr extends Synth::TSliceTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "SliceTypeRepr" }
+
+    /**
+     * Gets the type representation of this slice type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertSliceTypeReprToRaw(this)
+              .(Raw::SliceTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
index a7d5828ee980..8531b6c58a00 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
@@ -83,16 +83,17 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this static, if it exists.
+     * Gets the type representation of this static, if it exists.
      */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getTy())
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the visibility of this static, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
index 3a68b9de28e3..c95b7039deb0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -37,7 +37,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TArrayType(Raw::ArrayType id) { constructArrayType(id) } or
+    TArrayTypeRepr(Raw::ArrayTypeRepr id) { constructArrayTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -121,7 +121,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TDynTraitType(Raw::DynTraitType id) { constructDynTraitType(id) } or
+    TDynTraitTypeRepr(Raw::DynTraitTypeRepr id) { constructDynTraitTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -149,7 +149,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TFnPtrType(Raw::FnPtrType id) { constructFnPtrType(id) } or
+    TFnPtrTypeRepr(Raw::FnPtrTypeRepr id) { constructFnPtrTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -157,7 +157,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TForType(Raw::ForType id) { constructForType(id) } or
+    TForTypeRepr(Raw::ForTypeRepr id) { constructForTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -213,7 +213,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TImplTraitType(Raw::ImplTraitType id) { constructImplTraitType(id) } or
+    TImplTraitTypeRepr(Raw::ImplTraitTypeRepr id) { constructImplTraitTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -221,7 +221,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TInferType(Raw::InferType id) { constructInferType(id) } or
+    TInferTypeRepr(Raw::InferTypeRepr id) { constructInferTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -297,7 +297,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TMacroType(Raw::MacroType id) { constructMacroType(id) } or
+    TMacroTypeRepr(Raw::MacroTypeRepr id) { constructMacroTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -341,7 +341,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TNeverType(Raw::NeverType id) { constructNeverType(id) } or
+    TNeverTypeRepr(Raw::NeverTypeRepr id) { constructNeverTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -369,7 +369,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TParenType(Raw::ParenType id) { constructParenType(id) } or
+    TParenTypeRepr(Raw::ParenTypeRepr id) { constructParenTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -389,7 +389,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TPathType(Raw::PathType id) { constructPathType(id) } or
+    TPathTypeRepr(Raw::PathTypeRepr id) { constructPathTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -397,7 +397,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TPtrType(Raw::PtrType id) { constructPtrType(id) } or
+    TPtrTypeRepr(Raw::PtrTypeRepr id) { constructPtrTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -449,7 +449,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TRefType(Raw::RefType id) { constructRefType(id) } or
+    TRefTypeRepr(Raw::RefTypeRepr id) { constructRefTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -461,7 +461,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TRetType(Raw::RetType id) { constructRetType(id) } or
+    TRetTypeRepr(Raw::RetTypeRepr id) { constructRetTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -481,7 +481,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TSliceType(Raw::SliceType id) { constructSliceType(id) } or
+    TSliceTypeRepr(Raw::SliceTypeRepr id) { constructSliceTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -537,7 +537,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TTupleType(Raw::TupleType id) { constructTupleType(id) } or
+    TTupleTypeRepr(Raw::TupleTypeRepr id) { constructTupleTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -644,9 +644,9 @@ module Synth {
         TLabel or TLetElse or TLifetime or TMacroItems or TMacroStmts or TMatchArm or
         TMatchArmList or TMatchGuard or TMeta or TName or TNameRef or TParamBase or TParamList or
         TPat or TPathSegment or TRecordExprField or TRecordExprFieldList or TRecordField or
-        TRecordPatField or TRecordPatFieldList or TRename or TResolvable or TRetType or
+        TRecordPatField or TRecordPatFieldList or TRename or TResolvable or TRetTypeRepr or
         TReturnTypeSyntax or TSourceFile or TStmt or TStmtList or TToken or TTokenTree or
-        TTupleField or TTypeBound or TTypeBoundList or TTypeRef or TUseTree or TUseTreeList or
+        TTupleField or TTypeBound or TTypeBoundList or TTypeRepr or TUseTree or TUseTreeList or
         TVariantList or TVisibility or TWhereClause or TWherePred;
 
   /**
@@ -749,10 +749,10 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TTypeRef =
-    TArrayType or TDynTraitType or TFnPtrType or TForType or TImplTraitType or TInferType or
-        TMacroType or TNeverType or TParenType or TPathType or TPtrType or TRefType or TSliceType or
-        TTupleType;
+  class TTypeRepr =
+    TArrayTypeRepr or TDynTraitTypeRepr or TFnPtrTypeRepr or TForTypeRepr or TImplTraitTypeRepr or
+        TInferTypeRepr or TMacroTypeRepr or TNeverTypeRepr or TParenTypeRepr or TPathTypeRepr or
+        TPtrTypeRepr or TRefTypeRepr or TSliceTypeRepr or TTupleTypeRepr;
 
   /**
    * INTERNAL: Do not use.
@@ -793,9 +793,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TArrayType`, if possible.
+   * Converts a raw element to a synthesized `TArrayTypeRepr`, if possible.
    */
-  TArrayType convertArrayTypeFromRaw(Raw::Element e) { result = TArrayType(e) }
+  TArrayTypeRepr convertArrayTypeReprFromRaw(Raw::Element e) { result = TArrayTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -919,9 +919,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TDynTraitType`, if possible.
+   * Converts a raw element to a synthesized `TDynTraitTypeRepr`, if possible.
    */
-  TDynTraitType convertDynTraitTypeFromRaw(Raw::Element e) { result = TDynTraitType(e) }
+  TDynTraitTypeRepr convertDynTraitTypeReprFromRaw(Raw::Element e) { result = TDynTraitTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -961,9 +961,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TFnPtrType`, if possible.
+   * Converts a raw element to a synthesized `TFnPtrTypeRepr`, if possible.
    */
-  TFnPtrType convertFnPtrTypeFromRaw(Raw::Element e) { result = TFnPtrType(e) }
+  TFnPtrTypeRepr convertFnPtrTypeReprFromRaw(Raw::Element e) { result = TFnPtrTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -973,9 +973,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TForType`, if possible.
+   * Converts a raw element to a synthesized `TForTypeRepr`, if possible.
    */
-  TForType convertForTypeFromRaw(Raw::Element e) { result = TForType(e) }
+  TForTypeRepr convertForTypeReprFromRaw(Raw::Element e) { result = TForTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1047,9 +1047,11 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TImplTraitType`, if possible.
+   * Converts a raw element to a synthesized `TImplTraitTypeRepr`, if possible.
    */
-  TImplTraitType convertImplTraitTypeFromRaw(Raw::Element e) { result = TImplTraitType(e) }
+  TImplTraitTypeRepr convertImplTraitTypeReprFromRaw(Raw::Element e) {
+    result = TImplTraitTypeRepr(e)
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -1059,9 +1061,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TInferType`, if possible.
+   * Converts a raw element to a synthesized `TInferTypeRepr`, if possible.
    */
-  TInferType convertInferTypeFromRaw(Raw::Element e) { result = TInferType(e) }
+  TInferTypeRepr convertInferTypeReprFromRaw(Raw::Element e) { result = TInferTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1173,9 +1175,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMacroType`, if possible.
+   * Converts a raw element to a synthesized `TMacroTypeRepr`, if possible.
    */
-  TMacroType convertMacroTypeFromRaw(Raw::Element e) { result = TMacroType(e) }
+  TMacroTypeRepr convertMacroTypeReprFromRaw(Raw::Element e) { result = TMacroTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1239,9 +1241,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TNeverType`, if possible.
+   * Converts a raw element to a synthesized `TNeverTypeRepr`, if possible.
    */
-  TNeverType convertNeverTypeFromRaw(Raw::Element e) { result = TNeverType(e) }
+  TNeverTypeRepr convertNeverTypeReprFromRaw(Raw::Element e) { result = TNeverTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1281,9 +1283,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TParenType`, if possible.
+   * Converts a raw element to a synthesized `TParenTypeRepr`, if possible.
    */
-  TParenType convertParenTypeFromRaw(Raw::Element e) { result = TParenType(e) }
+  TParenTypeRepr convertParenTypeReprFromRaw(Raw::Element e) { result = TParenTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1311,9 +1313,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TPathType`, if possible.
+   * Converts a raw element to a synthesized `TPathTypeRepr`, if possible.
    */
-  TPathType convertPathTypeFromRaw(Raw::Element e) { result = TPathType(e) }
+  TPathTypeRepr convertPathTypeReprFromRaw(Raw::Element e) { result = TPathTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1323,9 +1325,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TPtrType`, if possible.
+   * Converts a raw element to a synthesized `TPtrTypeRepr`, if possible.
    */
-  TPtrType convertPtrTypeFromRaw(Raw::Element e) { result = TPtrType(e) }
+  TPtrTypeRepr convertPtrTypeReprFromRaw(Raw::Element e) { result = TPtrTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1405,9 +1407,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRefType`, if possible.
+   * Converts a raw element to a synthesized `TRefTypeRepr`, if possible.
    */
-  TRefType convertRefTypeFromRaw(Raw::Element e) { result = TRefType(e) }
+  TRefTypeRepr convertRefTypeReprFromRaw(Raw::Element e) { result = TRefTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1423,9 +1425,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRetType`, if possible.
+   * Converts a raw element to a synthesized `TRetTypeRepr`, if possible.
    */
-  TRetType convertRetTypeFromRaw(Raw::Element e) { result = TRetType(e) }
+  TRetTypeRepr convertRetTypeReprFromRaw(Raw::Element e) { result = TRetTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1453,9 +1455,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TSliceType`, if possible.
+   * Converts a raw element to a synthesized `TSliceTypeRepr`, if possible.
    */
-  TSliceType convertSliceTypeFromRaw(Raw::Element e) { result = TSliceType(e) }
+  TSliceTypeRepr convertSliceTypeReprFromRaw(Raw::Element e) { result = TSliceTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1537,9 +1539,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TTupleType`, if possible.
+   * Converts a raw element to a synthesized `TTupleTypeRepr`, if possible.
    */
-  TTupleType convertTupleTypeFromRaw(Raw::Element e) { result = TTupleType(e) }
+  TTupleTypeRepr convertTupleTypeReprFromRaw(Raw::Element e) { result = TTupleTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1780,7 +1782,7 @@ module Synth {
     or
     result = convertResolvableFromRaw(e)
     or
-    result = convertRetTypeFromRaw(e)
+    result = convertRetTypeReprFromRaw(e)
     or
     result = convertReturnTypeSyntaxFromRaw(e)
     or
@@ -1800,7 +1802,7 @@ module Synth {
     or
     result = convertTypeBoundListFromRaw(e)
     or
-    result = convertTypeRefFromRaw(e)
+    result = convertTypeReprFromRaw(e)
     or
     result = convertUseTreeFromRaw(e)
     or
@@ -2129,36 +2131,36 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TTypeRef`, if possible.
+   * Converts a raw DB element to a synthesized `TTypeRepr`, if possible.
    */
-  TTypeRef convertTypeRefFromRaw(Raw::Element e) {
-    result = convertArrayTypeFromRaw(e)
+  TTypeRepr convertTypeReprFromRaw(Raw::Element e) {
+    result = convertArrayTypeReprFromRaw(e)
     or
-    result = convertDynTraitTypeFromRaw(e)
+    result = convertDynTraitTypeReprFromRaw(e)
     or
-    result = convertFnPtrTypeFromRaw(e)
+    result = convertFnPtrTypeReprFromRaw(e)
     or
-    result = convertForTypeFromRaw(e)
+    result = convertForTypeReprFromRaw(e)
     or
-    result = convertImplTraitTypeFromRaw(e)
+    result = convertImplTraitTypeReprFromRaw(e)
     or
-    result = convertInferTypeFromRaw(e)
+    result = convertInferTypeReprFromRaw(e)
     or
-    result = convertMacroTypeFromRaw(e)
+    result = convertMacroTypeReprFromRaw(e)
     or
-    result = convertNeverTypeFromRaw(e)
+    result = convertNeverTypeReprFromRaw(e)
     or
-    result = convertParenTypeFromRaw(e)
+    result = convertParenTypeReprFromRaw(e)
     or
-    result = convertPathTypeFromRaw(e)
+    result = convertPathTypeReprFromRaw(e)
     or
-    result = convertPtrTypeFromRaw(e)
+    result = convertPtrTypeReprFromRaw(e)
     or
-    result = convertRefTypeFromRaw(e)
+    result = convertRefTypeReprFromRaw(e)
     or
-    result = convertSliceTypeFromRaw(e)
+    result = convertSliceTypeReprFromRaw(e)
     or
-    result = convertTupleTypeFromRaw(e)
+    result = convertTupleTypeReprFromRaw(e)
   }
 
   /**
@@ -2205,9 +2207,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TArrayType` to a raw DB element, if possible.
+   * Converts a synthesized `TArrayTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertArrayTypeToRaw(TArrayType e) { e = TArrayType(result) }
+  Raw::Element convertArrayTypeReprToRaw(TArrayTypeRepr e) { e = TArrayTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2331,9 +2333,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TDynTraitType` to a raw DB element, if possible.
+   * Converts a synthesized `TDynTraitTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertDynTraitTypeToRaw(TDynTraitType e) { e = TDynTraitType(result) }
+  Raw::Element convertDynTraitTypeReprToRaw(TDynTraitTypeRepr e) { e = TDynTraitTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2373,9 +2375,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TFnPtrType` to a raw DB element, if possible.
+   * Converts a synthesized `TFnPtrTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertFnPtrTypeToRaw(TFnPtrType e) { e = TFnPtrType(result) }
+  Raw::Element convertFnPtrTypeReprToRaw(TFnPtrTypeRepr e) { e = TFnPtrTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2385,9 +2387,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TForType` to a raw DB element, if possible.
+   * Converts a synthesized `TForTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertForTypeToRaw(TForType e) { e = TForType(result) }
+  Raw::Element convertForTypeReprToRaw(TForTypeRepr e) { e = TForTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2457,9 +2459,11 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TImplTraitType` to a raw DB element, if possible.
+   * Converts a synthesized `TImplTraitTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertImplTraitTypeToRaw(TImplTraitType e) { e = TImplTraitType(result) }
+  Raw::Element convertImplTraitTypeReprToRaw(TImplTraitTypeRepr e) {
+    e = TImplTraitTypeRepr(result)
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -2469,9 +2473,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TInferType` to a raw DB element, if possible.
+   * Converts a synthesized `TInferTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertInferTypeToRaw(TInferType e) { e = TInferType(result) }
+  Raw::Element convertInferTypeReprToRaw(TInferTypeRepr e) { e = TInferTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2583,9 +2587,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMacroType` to a raw DB element, if possible.
+   * Converts a synthesized `TMacroTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertMacroTypeToRaw(TMacroType e) { e = TMacroType(result) }
+  Raw::Element convertMacroTypeReprToRaw(TMacroTypeRepr e) { e = TMacroTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2649,9 +2653,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TNeverType` to a raw DB element, if possible.
+   * Converts a synthesized `TNeverTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertNeverTypeToRaw(TNeverType e) { e = TNeverType(result) }
+  Raw::Element convertNeverTypeReprToRaw(TNeverTypeRepr e) { e = TNeverTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2691,9 +2695,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TParenType` to a raw DB element, if possible.
+   * Converts a synthesized `TParenTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertParenTypeToRaw(TParenType e) { e = TParenType(result) }
+  Raw::Element convertParenTypeReprToRaw(TParenTypeRepr e) { e = TParenTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2721,9 +2725,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TPathType` to a raw DB element, if possible.
+   * Converts a synthesized `TPathTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertPathTypeToRaw(TPathType e) { e = TPathType(result) }
+  Raw::Element convertPathTypeReprToRaw(TPathTypeRepr e) { e = TPathTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2733,9 +2737,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TPtrType` to a raw DB element, if possible.
+   * Converts a synthesized `TPtrTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertPtrTypeToRaw(TPtrType e) { e = TPtrType(result) }
+  Raw::Element convertPtrTypeReprToRaw(TPtrTypeRepr e) { e = TPtrTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2815,9 +2819,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRefType` to a raw DB element, if possible.
+   * Converts a synthesized `TRefTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertRefTypeToRaw(TRefType e) { e = TRefType(result) }
+  Raw::Element convertRefTypeReprToRaw(TRefTypeRepr e) { e = TRefTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2833,9 +2837,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRetType` to a raw DB element, if possible.
+   * Converts a synthesized `TRetTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertRetTypeToRaw(TRetType e) { e = TRetType(result) }
+  Raw::Element convertRetTypeReprToRaw(TRetTypeRepr e) { e = TRetTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2863,9 +2867,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TSliceType` to a raw DB element, if possible.
+   * Converts a synthesized `TSliceTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertSliceTypeToRaw(TSliceType e) { e = TSliceType(result) }
+  Raw::Element convertSliceTypeReprToRaw(TSliceTypeRepr e) { e = TSliceTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2947,9 +2951,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTupleType` to a raw DB element, if possible.
+   * Converts a synthesized `TTupleTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertTupleTypeToRaw(TTupleType e) { e = TTupleType(result) }
+  Raw::Element convertTupleTypeReprToRaw(TTupleTypeRepr e) { e = TTupleTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -3190,7 +3194,7 @@ module Synth {
     or
     result = convertResolvableToRaw(e)
     or
-    result = convertRetTypeToRaw(e)
+    result = convertRetTypeReprToRaw(e)
     or
     result = convertReturnTypeSyntaxToRaw(e)
     or
@@ -3210,7 +3214,7 @@ module Synth {
     or
     result = convertTypeBoundListToRaw(e)
     or
-    result = convertTypeRefToRaw(e)
+    result = convertTypeReprToRaw(e)
     or
     result = convertUseTreeToRaw(e)
     or
@@ -3539,36 +3543,36 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTypeRef` to a raw DB element, if possible.
+   * Converts a synthesized `TTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertTypeRefToRaw(TTypeRef e) {
-    result = convertArrayTypeToRaw(e)
+  Raw::Element convertTypeReprToRaw(TTypeRepr e) {
+    result = convertArrayTypeReprToRaw(e)
     or
-    result = convertDynTraitTypeToRaw(e)
+    result = convertDynTraitTypeReprToRaw(e)
     or
-    result = convertFnPtrTypeToRaw(e)
+    result = convertFnPtrTypeReprToRaw(e)
     or
-    result = convertForTypeToRaw(e)
+    result = convertForTypeReprToRaw(e)
     or
-    result = convertImplTraitTypeToRaw(e)
+    result = convertImplTraitTypeReprToRaw(e)
     or
-    result = convertInferTypeToRaw(e)
+    result = convertInferTypeReprToRaw(e)
     or
-    result = convertMacroTypeToRaw(e)
+    result = convertMacroTypeReprToRaw(e)
     or
-    result = convertNeverTypeToRaw(e)
+    result = convertNeverTypeReprToRaw(e)
     or
-    result = convertParenTypeToRaw(e)
+    result = convertParenTypeReprToRaw(e)
     or
-    result = convertPathTypeToRaw(e)
+    result = convertPathTypeReprToRaw(e)
     or
-    result = convertPtrTypeToRaw(e)
+    result = convertPtrTypeReprToRaw(e)
     or
-    result = convertRefTypeToRaw(e)
+    result = convertRefTypeReprToRaw(e)
     or
-    result = convertSliceTypeToRaw(e)
+    result = convertSliceTypeReprToRaw(e)
     or
-    result = convertTupleTypeToRaw(e)
+    result = convertTupleTypeReprToRaw(e)
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
index ad2946105e88..0a9ccee4d562 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.internal.ArgListConstructor
 import codeql.rust.elements.internal.ArrayExprInternalConstructor
 import codeql.rust.elements.internal.ArrayListExprConstructor
 import codeql.rust.elements.internal.ArrayRepeatExprConstructor
-import codeql.rust.elements.internal.ArrayTypeConstructor
+import codeql.rust.elements.internal.ArrayTypeReprConstructor
 import codeql.rust.elements.internal.AsmExprConstructor
 import codeql.rust.elements.internal.AssocItemListConstructor
 import codeql.rust.elements.internal.AssocTypeArgConstructor
@@ -29,16 +29,16 @@ import codeql.rust.elements.internal.ConstArgConstructor
 import codeql.rust.elements.internal.ConstBlockPatConstructor
 import codeql.rust.elements.internal.ConstParamConstructor
 import codeql.rust.elements.internal.ContinueExprConstructor
-import codeql.rust.elements.internal.DynTraitTypeConstructor
+import codeql.rust.elements.internal.DynTraitTypeReprConstructor
 import codeql.rust.elements.internal.EnumConstructor
 import codeql.rust.elements.internal.ExprStmtConstructor
 import codeql.rust.elements.internal.ExternBlockConstructor
 import codeql.rust.elements.internal.ExternCrateConstructor
 import codeql.rust.elements.internal.ExternItemListConstructor
 import codeql.rust.elements.internal.FieldExprConstructor
-import codeql.rust.elements.internal.FnPtrTypeConstructor
+import codeql.rust.elements.internal.FnPtrTypeReprConstructor
 import codeql.rust.elements.internal.ForExprConstructor
-import codeql.rust.elements.internal.ForTypeConstructor
+import codeql.rust.elements.internal.ForTypeReprConstructor
 import codeql.rust.elements.internal.FormatConstructor
 import codeql.rust.elements.internal.FormatArgsArgConstructor
 import codeql.rust.elements.internal.FormatArgsExprConstructor
@@ -50,9 +50,9 @@ import codeql.rust.elements.internal.GenericParamListConstructor
 import codeql.rust.elements.internal.IdentPatConstructor
 import codeql.rust.elements.internal.IfExprConstructor
 import codeql.rust.elements.internal.ImplConstructor
-import codeql.rust.elements.internal.ImplTraitTypeConstructor
+import codeql.rust.elements.internal.ImplTraitTypeReprConstructor
 import codeql.rust.elements.internal.IndexExprConstructor
-import codeql.rust.elements.internal.InferTypeConstructor
+import codeql.rust.elements.internal.InferTypeReprConstructor
 import codeql.rust.elements.internal.ItemListConstructor
 import codeql.rust.elements.internal.LabelConstructor
 import codeql.rust.elements.internal.LetElseConstructor
@@ -71,7 +71,7 @@ import codeql.rust.elements.internal.MacroItemsConstructor
 import codeql.rust.elements.internal.MacroPatConstructor
 import codeql.rust.elements.internal.MacroRulesConstructor
 import codeql.rust.elements.internal.MacroStmtsConstructor
-import codeql.rust.elements.internal.MacroTypeConstructor
+import codeql.rust.elements.internal.MacroTypeReprConstructor
 import codeql.rust.elements.internal.MatchArmConstructor
 import codeql.rust.elements.internal.MatchArmListConstructor
 import codeql.rust.elements.internal.MatchExprConstructor
@@ -82,21 +82,21 @@ import codeql.rust.elements.internal.MissingConstructor
 import codeql.rust.elements.internal.ModuleConstructor
 import codeql.rust.elements.internal.NameConstructor
 import codeql.rust.elements.internal.NameRefConstructor
-import codeql.rust.elements.internal.NeverTypeConstructor
+import codeql.rust.elements.internal.NeverTypeReprConstructor
 import codeql.rust.elements.internal.OffsetOfExprConstructor
 import codeql.rust.elements.internal.OrPatConstructor
 import codeql.rust.elements.internal.ParamConstructor
 import codeql.rust.elements.internal.ParamListConstructor
 import codeql.rust.elements.internal.ParenExprConstructor
 import codeql.rust.elements.internal.ParenPatConstructor
-import codeql.rust.elements.internal.ParenTypeConstructor
+import codeql.rust.elements.internal.ParenTypeReprConstructor
 import codeql.rust.elements.internal.PathConstructor
 import codeql.rust.elements.internal.PathExprConstructor
 import codeql.rust.elements.internal.PathPatConstructor
 import codeql.rust.elements.internal.PathSegmentConstructor
-import codeql.rust.elements.internal.PathTypeConstructor
+import codeql.rust.elements.internal.PathTypeReprConstructor
 import codeql.rust.elements.internal.PrefixExprConstructor
-import codeql.rust.elements.internal.PtrTypeConstructor
+import codeql.rust.elements.internal.PtrTypeReprConstructor
 import codeql.rust.elements.internal.RangeExprConstructor
 import codeql.rust.elements.internal.RangePatConstructor
 import codeql.rust.elements.internal.RecordExprConstructor
@@ -109,15 +109,15 @@ import codeql.rust.elements.internal.RecordPatFieldConstructor
 import codeql.rust.elements.internal.RecordPatFieldListConstructor
 import codeql.rust.elements.internal.RefExprConstructor
 import codeql.rust.elements.internal.RefPatConstructor
-import codeql.rust.elements.internal.RefTypeConstructor
+import codeql.rust.elements.internal.RefTypeReprConstructor
 import codeql.rust.elements.internal.RenameConstructor
 import codeql.rust.elements.internal.RestPatConstructor
-import codeql.rust.elements.internal.RetTypeConstructor
+import codeql.rust.elements.internal.RetTypeReprConstructor
 import codeql.rust.elements.internal.ReturnExprConstructor
 import codeql.rust.elements.internal.ReturnTypeSyntaxConstructor
 import codeql.rust.elements.internal.SelfParamConstructor
 import codeql.rust.elements.internal.SlicePatConstructor
-import codeql.rust.elements.internal.SliceTypeConstructor
+import codeql.rust.elements.internal.SliceTypeReprConstructor
 import codeql.rust.elements.internal.SourceFileConstructor
 import codeql.rust.elements.internal.StaticConstructor
 import codeql.rust.elements.internal.StmtListConstructor
@@ -131,7 +131,7 @@ import codeql.rust.elements.internal.TupleFieldConstructor
 import codeql.rust.elements.internal.TupleFieldListConstructor
 import codeql.rust.elements.internal.TuplePatConstructor
 import codeql.rust.elements.internal.TupleStructPatConstructor
-import codeql.rust.elements.internal.TupleTypeConstructor
+import codeql.rust.elements.internal.TupleTypeReprConstructor
 import codeql.rust.elements.internal.TypeAliasConstructor
 import codeql.rust.elements.internal.TypeArgConstructor
 import codeql.rust.elements.internal.TypeBoundConstructor
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
index fa7b8a338ff5..e7dd183a171d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
@@ -8,7 +8,7 @@ private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.Attr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
@@ -48,17 +48,19 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the ty of this tuple field, if it exists.
+     * Gets the type representation of this tuple field, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertTupleFieldToRaw(this).(Raw::TupleField).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertTupleFieldToRaw(this)
+              .(Raw::TupleField)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the visibility of this tuple field, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
index 0e7fc44809e2..724a827f7c3b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
@@ -27,7 +27,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TuplePat" }
 
     /**
-     * Gets the `index`th field of this tuple pat (0-based).
+     * Gets the `index`th field of this tuple pattern (0-based).
      */
     Pat getField(int index) {
       result =
@@ -35,12 +35,12 @@ module Generated {
     }
 
     /**
-     * Gets any of the fields of this tuple pat.
+     * Gets any of the fields of this tuple pattern.
      */
     final Pat getAField() { result = this.getField(_) }
 
     /**
-     * Gets the number of fields of this tuple pat.
+     * Gets the number of fields of this tuple pattern.
      */
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
index ed4e57d87195..73cf9a1d9c36 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
@@ -31,7 +31,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TupleStructPat" }
 
     /**
-     * Gets the `index`th field of this tuple struct pat (0-based).
+     * Gets the `index`th field of this tuple struct pattern (0-based).
      */
     Pat getField(int index) {
       result =
@@ -41,17 +41,17 @@ module Generated {
     }
 
     /**
-     * Gets any of the fields of this tuple struct pat.
+     * Gets any of the fields of this tuple struct pattern.
      */
     final Pat getAField() { result = this.getField(_) }
 
     /**
-     * Gets the number of fields of this tuple struct pat.
+     * Gets the number of fields of this tuple struct pattern.
      */
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
 
     /**
-     * Gets the path of this tuple struct pat, if it exists.
+     * Gets the path of this tuple struct pattern, if it exists.
      */
     Path getPath() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll
deleted file mode 100644
index ec7d95114d88..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll
+++ /dev/null
@@ -1,48 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `TupleType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `TupleType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A TupleType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::TupleType` class directly.
-   * Use the subclass `TupleType`, where the following predicates are available.
-   */
-  class TupleType extends Synth::TTupleType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "TupleType" }
-
-    /**
-     * Gets the `index`th field of this tuple type (0-based).
-     */
-    TypeRef getField(int index) {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertTupleTypeToRaw(this)
-              .(Raw::TupleType)
-              .getField(index))
-    }
-
-    /**
-     * Gets any of the fields of this tuple type.
-     */
-    final TypeRef getAField() { result = this.getField(_) }
-
-    /**
-     * Gets the number of fields of this tuple type.
-     */
-    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll
new file mode 100644
index 000000000000..5929c019ff46
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TupleTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TupleTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TupleTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TupleTypeRepr` class directly.
+   * Use the subclass `TupleTypeRepr`, where the following predicates are available.
+   */
+  class TupleTypeRepr extends Synth::TTupleTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "TupleTypeRepr" }
+
+    /**
+     * Gets the `index`th field of this tuple type representation (0-based).
+     */
+    TypeRepr getField(int index) {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertTupleTypeReprToRaw(this)
+              .(Raw::TupleTypeRepr)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this tuple type representation.
+     */
+    final TypeRepr getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this tuple type representation.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
index 2f5294ef65e8..b460194cdc35 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
@@ -13,7 +13,7 @@ import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
@@ -87,17 +87,19 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this type alias, if it exists.
+     * Gets the type representation of this type alias, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the type bound list of this type alias, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
index 29b24efb9301..da8742cd188a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `TypeArg` and should not
@@ -26,15 +26,16 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TypeArg" }
 
     /**
-     * Gets the ty of this type argument, if it exists.
+     * Gets the type representation of this type argument, if it exists.
      */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertTypeArgToRaw(this).(Raw::TypeArg).getTy())
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertTypeArgToRaw(this).(Raw::TypeArg).getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
index e83586d9cdf9..ff19afa11841 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Lifetime
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `TypeBound` and should not
@@ -68,16 +68,18 @@ module Generated {
     final predicate hasLifetime() { exists(this.getLifetime()) }
 
     /**
-     * Gets the ty of this type bound, if it exists.
+     * Gets the type representation of this type bound, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertTypeBoundToRaw(this).(Raw::TypeBound).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertTypeBoundToRaw(this)
+              .(Raw::TypeBound)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
index 6b010ca50db2..0c7c71df4f4d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `TypeParam` and should not
@@ -49,9 +49,9 @@ module Generated {
     /**
      * Gets the default type of this type parameter, if it exists.
      */
-    TypeRef getDefaultType() {
+    TypeRepr getDefaultType() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertTypeParamToRaw(this)
+        Synth::convertTypeReprFromRaw(Synth::convertTypeParamToRaw(this)
               .(Raw::TypeParam)
               .getDefaultType())
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRepr.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/TypeRepr.qll
index 2eab9874ecc3..0bb253c389dc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRepr.qll
@@ -1,6 +1,6 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `TypeRef`.
+ * This module provides the generated definition of `TypeRepr`.
  * INTERNAL: Do not import directly.
  */
 
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 
 /**
- * INTERNAL: This module contains the fully generated definition of `TypeRef` and should not
+ * INTERNAL: This module contains the fully generated definition of `TypeRepr` and should not
  * be referenced directly.
  */
 module Generated {
@@ -20,8 +20,8 @@ module Generated {
    * let y: Vec<i32>;
    * let z: Option<i32>;
    * ```
-   * INTERNAL: Do not reference the `Generated::TypeRef` class directly.
-   * Use the subclass `TypeRef`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::TypeRepr` class directly.
+   * Use the subclass `TypeRepr`, where the following predicates are available.
    */
-  class TypeRef extends Synth::TTypeRef, AstNodeImpl::AstNode { }
+  class TypeRepr extends Synth::TTypeRepr, AstNodeImpl::AstNode { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
index 90a1d732b30a..6e68c7a25a69 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `WherePred` and should not
@@ -59,17 +59,19 @@ module Generated {
     final predicate hasLifetime() { exists(this.getLifetime()) }
 
     /**
-     * Gets the ty of this where pred, if it exists.
+     * Gets the type representation of this where pred, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertWherePredToRaw(this).(Raw::WherePred).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertWherePredToRaw(this)
+              .(Raw::WherePred)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the type bound list of this where pred, if it exists.
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 56aead11ede0..32c5387cdf18 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -174,7 +174,7 @@ locatable_locations(
 | @record_pat_field_list
 | @rename
 | @resolvable
-| @ret_type
+| @ret_type_repr
 | @return_type_syntax
 | @source_file
 | @stmt
@@ -184,7 +184,7 @@ locatable_locations(
 | @tuple_field
 | @type_bound
 | @type_bound_list
-| @type_ref
+| @type_repr
 | @use_tree
 | @use_tree_list
 | @variant_list
@@ -611,9 +611,9 @@ param_base_attrs(
 );
 
 #keyset[id]
-param_base_ties(
+param_base_type_reprs(
   int id: @param_base ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 param_lists(
@@ -677,13 +677,13 @@ path_segment_param_lists(
 #keyset[id]
 path_segment_path_types(
   int id: @path_segment ref,
-  int path_type: @path_type ref
+  int path_type: @path_type_repr ref
 );
 
 #keyset[id]
 path_segment_ret_types(
   int id: @path_segment ref,
-  int ret_type: @ret_type ref
+  int ret_type: @ret_type_repr ref
 );
 
 #keyset[id]
@@ -693,9 +693,9 @@ path_segment_return_type_syntaxes(
 );
 
 #keyset[id]
-path_segment_ties(
+path_segment_type_reprs(
   int id: @path_segment ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 record_expr_fields(
@@ -763,9 +763,9 @@ record_field_names(
 );
 
 #keyset[id]
-record_field_ties(
+record_field_type_reprs(
   int id: @record_field ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -841,14 +841,14 @@ resolvable_resolved_crate_origins(
   string resolved_crate_origin: string ref
 );
 
-ret_types(
-  unique int id: @ret_type
+ret_type_reprs(
+  unique int id: @ret_type_repr
 );
 
 #keyset[id]
-ret_type_ties(
-  int id: @ret_type ref,
-  int ty: @type_ref ref
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 return_type_syntaxes(
@@ -923,9 +923,9 @@ tuple_field_attrs(
 );
 
 #keyset[id]
-tuple_field_ties(
+tuple_field_type_reprs(
   int id: @tuple_field ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -961,9 +961,9 @@ type_bound_lifetimes(
 );
 
 #keyset[id]
-type_bound_ties(
+type_bound_type_reprs(
   int id: @type_bound ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 type_bound_lists(
@@ -977,21 +977,21 @@ type_bound_list_bounds(
   int bound: @type_bound ref
 );
 
-@type_ref =
-  @array_type
-| @dyn_trait_type
-| @fn_ptr_type
-| @for_type
-| @impl_trait_type
-| @infer_type
-| @macro_type
-| @never_type
-| @paren_type
-| @path_type
-| @ptr_type
-| @ref_type
-| @slice_type
-| @tuple_type
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
 ;
 
 use_trees(
@@ -1076,9 +1076,9 @@ where_pred_lifetimes(
 );
 
 #keyset[id]
-where_pred_ties(
+where_pred_type_reprs(
   int id: @where_pred ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -1110,20 +1110,20 @@ array_expr_internal_is_semicolon(
   int id: @array_expr_internal ref
 );
 
-array_types(
-  unique int id: @array_type
+array_type_reprs(
+  unique int id: @array_type_repr
 );
 
 #keyset[id]
-array_type_const_args(
-  int id: @array_type ref,
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
   int const_arg: @const_arg ref
 );
 
 #keyset[id]
-array_type_ties(
-  int id: @array_type ref,
-  int ty: @type_ref ref
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
 );
 
 asm_exprs(
@@ -1174,7 +1174,7 @@ assoc_type_arg_param_lists(
 #keyset[id]
 assoc_type_arg_ret_types(
   int id: @assoc_type_arg ref,
-  int ret_type: @ret_type ref
+  int ret_type: @ret_type_repr ref
 );
 
 #keyset[id]
@@ -1184,9 +1184,9 @@ assoc_type_arg_return_type_syntaxes(
 );
 
 #keyset[id]
-assoc_type_arg_ties(
+assoc_type_arg_type_reprs(
   int id: @assoc_type_arg ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -1327,9 +1327,9 @@ cast_expr_exprs(
 );
 
 #keyset[id]
-cast_expr_ties(
+cast_expr_type_reprs(
   int id: @cast_expr ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 closure_exprs(
@@ -1376,7 +1376,7 @@ closure_expr_is_static(
 #keyset[id]
 closure_expr_ret_types(
   int id: @closure_expr ref,
-  int ret_type: @ret_type ref
+  int ret_type: @ret_type_repr ref
 );
 
 comments(
@@ -1439,9 +1439,9 @@ const_param_names(
 );
 
 #keyset[id]
-const_param_ties(
+const_param_type_reprs(
   int id: @const_param ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 continue_exprs(
@@ -1461,13 +1461,13 @@ continue_expr_lifetimes(
   int lifetime: @lifetime ref
 );
 
-dyn_trait_types(
-  unique int id: @dyn_trait_type
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
 );
 
 #keyset[id]
-dyn_trait_type_type_bound_lists(
-  int id: @dyn_trait_type ref,
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
   int type_bound_list: @type_bound_list ref
 );
 
@@ -1504,57 +1504,57 @@ field_expr_name_refs(
   int name_ref: @name_ref ref
 );
 
-fn_ptr_types(
-  unique int id: @fn_ptr_type
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
 );
 
 #keyset[id]
-fn_ptr_type_abis(
-  int id: @fn_ptr_type ref,
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
   int abi: @abi ref
 );
 
 #keyset[id]
-fn_ptr_type_is_async(
-  int id: @fn_ptr_type ref
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
 );
 
 #keyset[id]
-fn_ptr_type_is_const(
-  int id: @fn_ptr_type ref
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
 );
 
 #keyset[id]
-fn_ptr_type_is_unsafe(
-  int id: @fn_ptr_type ref
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
 );
 
 #keyset[id]
-fn_ptr_type_param_lists(
-  int id: @fn_ptr_type ref,
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
   int param_list: @param_list ref
 );
 
 #keyset[id]
-fn_ptr_type_ret_types(
-  int id: @fn_ptr_type ref,
-  int ret_type: @ret_type ref
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
 );
 
-for_types(
-  unique int id: @for_type
+for_type_reprs(
+  unique int id: @for_type_repr
 );
 
 #keyset[id]
-for_type_generic_param_lists(
-  int id: @for_type ref,
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
   int generic_param_list: @generic_param_list ref
 );
 
 #keyset[id]
-for_type_ties(
-  int id: @for_type ref,
-  int ty: @type_ref ref
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 format_args_exprs(
@@ -1643,13 +1643,13 @@ if_expr_thens(
   int then: @block_expr ref
 );
 
-impl_trait_types(
-  unique int id: @impl_trait_type
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
 );
 
 #keyset[id]
-impl_trait_type_type_bound_lists(
-  int id: @impl_trait_type ref,
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
   int type_bound_list: @type_bound_list ref
 );
 
@@ -1676,8 +1676,8 @@ index_expr_indices(
   int index: @expr ref
 );
 
-infer_types(
-  unique int id: @infer_type
+infer_type_reprs(
+  unique int id: @infer_type_repr
 );
 
 @item =
@@ -1764,9 +1764,9 @@ let_stmt_pats(
 );
 
 #keyset[id]
-let_stmt_ties(
+let_stmt_type_reprs(
   int id: @let_stmt ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 lifetime_args(
@@ -1849,13 +1849,13 @@ macro_pat_macro_calls(
   int macro_call: @macro_call ref
 );
 
-macro_types(
-  unique int id: @macro_type
+macro_type_reprs(
+  unique int id: @macro_type_repr
 );
 
 #keyset[id]
-macro_type_macro_calls(
-  int id: @macro_type ref,
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
   int macro_call: @macro_call ref
 );
 
@@ -1882,8 +1882,8 @@ match_expr_match_arm_lists(
   int match_arm_list: @match_arm_list ref
 );
 
-never_types(
-  unique int id: @never_type
+never_type_reprs(
+  unique int id: @never_type_repr
 );
 
 offset_of_exprs(
@@ -1905,9 +1905,9 @@ offset_of_expr_fields(
 );
 
 #keyset[id]
-offset_of_expr_ties(
+offset_of_expr_type_reprs(
   int id: @offset_of_expr ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 or_pats(
@@ -1958,14 +1958,14 @@ paren_pat_pats(
   int pat: @pat ref
 );
 
-paren_types(
-  unique int id: @paren_type
+paren_type_reprs(
+  unique int id: @paren_type_repr
 );
 
 #keyset[id]
-paren_type_ties(
-  int id: @paren_type ref,
-  int ty: @type_ref ref
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 paths(
@@ -1998,13 +1998,13 @@ path_pat_paths(
   int path: @path ref
 );
 
-path_types(
-  unique int id: @path_type
+path_type_reprs(
+  unique int id: @path_type_repr
 );
 
 #keyset[id]
-path_type_paths(
-  int id: @path_type ref,
+path_type_repr_paths(
+  int id: @path_type_repr ref,
   int path: @path ref
 );
 
@@ -2031,24 +2031,24 @@ prefix_expr_operator_names(
   string operator_name: string ref
 );
 
-ptr_types(
-  unique int id: @ptr_type
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
 );
 
 #keyset[id]
-ptr_type_is_const(
-  int id: @ptr_type ref
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
 );
 
 #keyset[id]
-ptr_type_is_mut(
-  int id: @ptr_type ref
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
 );
 
 #keyset[id]
-ptr_type_ties(
-  int id: @ptr_type ref,
-  int ty: @type_ref ref
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 range_exprs(
@@ -2192,25 +2192,25 @@ ref_pat_pats(
   int pat: @pat ref
 );
 
-ref_types(
-  unique int id: @ref_type
+ref_type_reprs(
+  unique int id: @ref_type_repr
 );
 
 #keyset[id]
-ref_type_is_mut(
-  int id: @ref_type ref
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
 );
 
 #keyset[id]
-ref_type_lifetimes(
-  int id: @ref_type ref,
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
   int lifetime: @lifetime ref
 );
 
 #keyset[id]
-ref_type_ties(
-  int id: @ref_type ref,
-  int ty: @type_ref ref
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 rest_pats(
@@ -2273,14 +2273,14 @@ slice_pat_pats(
   int pat: @pat ref
 );
 
-slice_types(
-  unique int id: @slice_type
+slice_type_reprs(
+  unique int id: @slice_type_repr
 );
 
 #keyset[id]
-slice_type_ties(
-  int id: @slice_type ref,
-  int ty: @type_ref ref
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 try_exprs(
@@ -2357,15 +2357,15 @@ tuple_struct_pat_paths(
   int path: @path ref
 );
 
-tuple_types(
-  unique int id: @tuple_type
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
 );
 
 #keyset[id, index]
-tuple_type_fields(
-  int id: @tuple_type ref,
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
   int index: int ref,
-  int field: @type_ref ref
+  int field: @type_repr ref
 );
 
 type_args(
@@ -2373,9 +2373,9 @@ type_args(
 );
 
 #keyset[id]
-type_arg_ties(
+type_arg_type_reprs(
   int id: @type_arg ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 type_params(
@@ -2392,7 +2392,7 @@ type_param_attrs(
 #keyset[id]
 type_param_default_types(
   int id: @type_param ref,
-  int default_type: @type_ref ref
+  int default_type: @type_repr ref
 );
 
 #keyset[id]
@@ -2582,9 +2582,9 @@ const_names(
 );
 
 #keyset[id]
-const_ties(
+const_type_reprs(
   int id: @const ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -2747,7 +2747,7 @@ function_names(
 #keyset[id]
 function_ret_types(
   int id: @function ref,
-  int ret_type: @ret_type ref
+  int ret_type: @ret_type_repr ref
 );
 
 #keyset[id]
@@ -2803,13 +2803,13 @@ impl_is_unsafe(
 #keyset[id]
 impl_self_ties(
   int id: @impl ref,
-  int self_ty: @type_ref ref
+  int self_ty: @type_repr ref
 );
 
 #keyset[id]
 impl_traits(
   int id: @impl ref,
-  int trait: @type_ref ref
+  int trait: @type_repr ref
 );
 
 #keyset[id]
@@ -3031,9 +3031,9 @@ static_names(
 );
 
 #keyset[id]
-static_ties(
+static_type_reprs(
   int id: @static ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -3210,9 +3210,9 @@ type_alias_names(
 );
 
 #keyset[id]
-type_alias_ties(
+type_alias_type_reprs(
   int id: @type_alias ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
index b2f6bcd4cb16..b39bf6b63ee9 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -2,7 +2,7 @@ Abi/gen_abi.rs 5d2f6eccb2bab86080188be9700ab64a34fa6e8e8e7b08f65a5c97d1de0a900c
 ArgList/gen_arg_list.rs 569d0b9b0479de5453ae0f89e4f90e32b02ee84dfb3d815821d722ece6f75b64 569d0b9b0479de5453ae0f89e4f90e32b02ee84dfb3d815821d722ece6f75b64
 ArrayListExpr/gen_array_list_expr.rs 99a1233b77a6b6eb0a538025688ca5a0824118a123bef0fe3f92a81834b17924 99a1233b77a6b6eb0a538025688ca5a0824118a123bef0fe3f92a81834b17924
 ArrayRepeatExpr/gen_array_repeat_expr.rs 8cc7c0a435a02864290db6a498a5fcf227d8ee7ed87ee1943ad4d326c8314a0e 8cc7c0a435a02864290db6a498a5fcf227d8ee7ed87ee1943ad4d326c8314a0e
-ArrayType/gen_array_type.rs 3cb5f35006648d676ead1088aa330cd34beaabaaad7b9aa952e6375bc1cec5cb 3cb5f35006648d676ead1088aa330cd34beaabaaad7b9aa952e6375bc1cec5cb
+ArrayTypeRepr/gen_array_type_repr.rs 9cf7a12a6f7da3342db4ab65dfb5deefb1ef57398e2236fbb49d3280dad944ae 9cf7a12a6f7da3342db4ab65dfb5deefb1ef57398e2236fbb49d3280dad944ae
 AsmExpr/gen_asm_expr.rs 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158
 AssocTypeArg/gen_assoc_type_arg.rs 00ec0e22c4d73338de605dc3b1b1306bc83a95f87376ce976f08d2f9923cc2b4 00ec0e22c4d73338de605dc3b1b1306bc83a95f87376ce976f08d2f9923cc2b4
 Attr/gen_attr.rs cd6e50f5ebb17066209682b1a9f22ff116584ffef180d8ab51e2ba5cab6a91ec cd6e50f5ebb17066209682b1a9f22ff116584ffef180d8ab51e2ba5cab6a91ec
@@ -22,16 +22,16 @@ ConstArg/gen_const_arg.rs feab3cdbbc469a287884ff7605e9a7541f904e9e5bd1f14a8e0f74
 ConstBlockPat/gen_const_block_pat.rs 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd
 ConstParam/gen_const_param.rs f0a4176333b9519b4cc2533a083f68f6859b5b0855d1b0dbcef4d4e206721830 f0a4176333b9519b4cc2533a083f68f6859b5b0855d1b0dbcef4d4e206721830
 ContinueExpr/gen_continue_expr.rs 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff
-DynTraitType/gen_dyn_trait_type.rs 65b8e54bdc4bdfff8b68480582acca642bf2d28e316c5251fb3b8371cd7328bd 65b8e54bdc4bdfff8b68480582acca642bf2d28e316c5251fb3b8371cd7328bd
+DynTraitTypeRepr/gen_dyn_trait_type_repr.rs ca6cb23c5996713121e3920652251c1c75136d31319558e366ef56941e9fe7de ca6cb23c5996713121e3920652251c1c75136d31319558e366ef56941e9fe7de
 Enum/gen_enum.rs efa816c579bfba60d1f32f818b022956d08d397af508c82b7331f14615f25be4 efa816c579bfba60d1f32f818b022956d08d397af508c82b7331f14615f25be4
 ExprStmt/gen_expr_stmt.rs 6ce47428a8d33b902c1f14b06cc375d08eff95251e4a81dac2fa51872b7649b1 6ce47428a8d33b902c1f14b06cc375d08eff95251e4a81dac2fa51872b7649b1
 ExternBlock/gen_extern_block.rs 5b5c4d7a2c4a91027df1578b74900ae1b971aede7720ab12de9bb918c42a583d 5b5c4d7a2c4a91027df1578b74900ae1b971aede7720ab12de9bb918c42a583d
 ExternCrate/gen_extern_crate.rs 9b3ab23a56b7778723ce436b25310547b2b0aeca3e5c6b7e61f273b5ce5573e3 9b3ab23a56b7778723ce436b25310547b2b0aeca3e5c6b7e61f273b5ce5573e3
 ExternItemList/gen_extern_item_list.rs ff2baaaa32099808b86fbf6f4853171146594d5db23c6ee447eb5cec10cee7cf ff2baaaa32099808b86fbf6f4853171146594d5db23c6ee447eb5cec10cee7cf
 FieldExpr/gen_field_expr.rs 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b
-FnPtrType/gen_fn_ptr_type.rs a7842d8c21636739d1be959e5ce5e0b23482d5ef6eab5c45b009895da8175932 a7842d8c21636739d1be959e5ce5e0b23482d5ef6eab5c45b009895da8175932
+FnPtrTypeRepr/gen_fn_ptr_type_repr.rs 46af312570a9caec11e14ba05190e95e750c32565559f1622a132f7145320253 46af312570a9caec11e14ba05190e95e750c32565559f1622a132f7145320253
 ForExpr/gen_for_expr.rs 67decf3073e1a9363d9df05a5a64a6059349e50b81356f480f7aeb352189136d 67decf3073e1a9363d9df05a5a64a6059349e50b81356f480f7aeb352189136d
-ForType/gen_for_type.rs 6cb447df02c61b192e283e019576c28225added02d167030d64ebd0bebb1b158 6cb447df02c61b192e283e019576c28225added02d167030d64ebd0bebb1b158
+ForTypeRepr/gen_for_type_repr.rs 5108a5d63ce440305b92dd87387c22a0a57abfd19d88e03e1984e1537779f4a4 5108a5d63ce440305b92dd87387c22a0a57abfd19d88e03e1984e1537779f4a4
 FormatArgsExpr/gen_format.rs bd009cb152c35e2aacd147b5520a42be31e66e9a8715ec1d0fd57b8e97c743ed bd009cb152c35e2aacd147b5520a42be31e66e9a8715ec1d0fd57b8e97c743ed
 FormatArgsExpr/gen_format_args_arg.rs c466f2fc2c0f9592061a159a217a87551d67f1ccb0e4d8f7f56a463a2aa4a73a c466f2fc2c0f9592061a159a217a87551d67f1ccb0e4d8f7f56a463a2aa4a73a
 FormatArgsExpr/gen_format_args_expr.rs 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2
@@ -42,9 +42,9 @@ GenericParamList/gen_generic_param_list.rs 4cc9b628f53e1a6c5781ad195b8648fa6dee0
 IdentPat/gen_ident_pat.rs 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477
 IfExpr/gen_if_expr.rs 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8
 Impl/gen_impl.rs dd97fa44ec844b735b30e7dfd1b8ecd4449c7914af1ea427edcba848194a84ed dd97fa44ec844b735b30e7dfd1b8ecd4449c7914af1ea427edcba848194a84ed
-ImplTraitType/gen_impl_trait_type.rs feef13242cbee4e8c59a6db01778384d6d27d5b702431c2fd8dca0859f04a831 feef13242cbee4e8c59a6db01778384d6d27d5b702431c2fd8dca0859f04a831
+ImplTraitTypeRepr/gen_impl_trait_type_repr.rs 3d8bc5bb967bcb3ff38bf0487411e2945a57b36aad43dedcad17de9c6bf717d5 3d8bc5bb967bcb3ff38bf0487411e2945a57b36aad43dedcad17de9c6bf717d5
 IndexExpr/gen_index_expr.rs 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61
-InferType/gen_infer_type.rs d1b7ee04417cfa8617bfd170920a48e8cfe97373b704153f5e2182ae29072ca3 d1b7ee04417cfa8617bfd170920a48e8cfe97373b704153f5e2182ae29072ca3
+InferTypeRepr/gen_infer_type_repr.rs 96f1b2d20319b031dde75b0bd612d4a4366315f2bc75590e5e422603f7a35541 96f1b2d20319b031dde75b0bd612d4a4366315f2bc75590e5e422603f7a35541
 ItemList/gen_item_list.rs 2ea6180e66de963627aabdaf64ce3c95c40cc7628d8734607ae2720bab857643 2ea6180e66de963627aabdaf64ce3c95c40cc7628d8734607ae2720bab857643
 Label/gen_label.rs 0584f519f210f621d7ebc0cb8c95ce05db0795d6109c0d16866f8f699a28213c 0584f519f210f621d7ebc0cb8c95ce05db0795d6109c0d16866f8f699a28213c
 LetElse/gen_let_else.rs 2cb09461b0ea48f666bd65a208663e64a874efadacb22764301871ea07956901 2cb09461b0ea48f666bd65a208663e64a874efadacb22764301871ea07956901
@@ -63,7 +63,7 @@ MacroItems/gen_macro_items.rs 8ef3e16b73635dc97afa3ffa4db2bb21a8f1b435176861a594
 MacroPat/gen_macro_pat.rs b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0 b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0
 MacroRules/gen_macro_rules.rs 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9
 MacroStmts/gen_macro_stmts.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b
-MacroType/gen_macro_type.rs 84db79c78860512b14f885391fcae999ca7282f2d8a9ab65d30cc413d5bbebd0 84db79c78860512b14f885391fcae999ca7282f2d8a9ab65d30cc413d5bbebd0
+MacroTypeRepr/gen_macro_type_repr.rs 03c15f1fd5af63821e49a125d236704c63889fe20a32f03f3ecf3e29b1cad9df 03c15f1fd5af63821e49a125d236704c63889fe20a32f03f3ecf3e29b1cad9df
 MatchArm/gen_match_arm.rs ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5 ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5
 MatchArmList/gen_match_arm_list.rs dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6 dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6
 MatchExpr/gen_match_expr.rs 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0
@@ -73,20 +73,20 @@ MethodCallExpr/gen_method_call_expr.rs f2b4679eb1ec095981fe6bd656b632c22bf6bd0da
 Module/gen_module.rs 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1
 Name/gen_name.rs bbf5cff7da2400de554712ed66ff1e6370170ba988209b4e346bc053421df1ff bbf5cff7da2400de554712ed66ff1e6370170ba988209b4e346bc053421df1ff
 NameRef/gen_name_ref.rs 41307c2f7ca82d28217129639e556bd4c91221cf3a4170250b313fd53b9e3f82 41307c2f7ca82d28217129639e556bd4c91221cf3a4170250b313fd53b9e3f82
-NeverType/gen_never_type.rs a5413fab6a45dcfc2ff0ec5c8308b6c515963212ec4aa9edb9a96ec9a7e96830 a5413fab6a45dcfc2ff0ec5c8308b6c515963212ec4aa9edb9a96ec9a7e96830
+NeverTypeRepr/gen_never_type_repr.rs b9bf7cc4df2e5be4e85c0701b94ec189080db1dbc6e2c9ef0480c7f2f4b0fc17 b9bf7cc4df2e5be4e85c0701b94ec189080db1dbc6e2c9ef0480c7f2f4b0fc17
 OffsetOfExpr/gen_offset_of_expr.rs 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934
 OrPat/gen_or_pat.rs 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56
 Param/gen_param.rs 39f3979d6cb10e4c43e0b5601af2a92b7520a75a104211955bbbb5e6f13e9db9 39f3979d6cb10e4c43e0b5601af2a92b7520a75a104211955bbbb5e6f13e9db9
 ParamList/gen_param_list.rs ef2e83d0aed45b969fe78dd717e87ef3c1f848e6179cfb4dc3cb136f1836b998 ef2e83d0aed45b969fe78dd717e87ef3c1f848e6179cfb4dc3cb136f1836b998
 ParenExpr/gen_paren_expr.rs dd0c4a21a92e54e8a6151145e013cbec9c9e1cad093d572e293b4f51d6c44aea dd0c4a21a92e54e8a6151145e013cbec9c9e1cad093d572e293b4f51d6c44aea
 ParenPat/gen_paren_pat.rs c8d18521b9a0b7d39841eb72e3895914aa652b7235dea42ed12a4eb280e3bf0e c8d18521b9a0b7d39841eb72e3895914aa652b7235dea42ed12a4eb280e3bf0e
-ParenType/gen_paren_type.rs ae1a945b56020eab14bb0ef75ae9ccb735d8e45d1213adee210a90e6dba8430f ae1a945b56020eab14bb0ef75ae9ccb735d8e45d1213adee210a90e6dba8430f
+ParenTypeRepr/gen_paren_type_repr.rs 360a9415390ab572cb10015603537823cc0451bb94ef487d04bbfd7d523bee95 360a9415390ab572cb10015603537823cc0451bb94ef487d04bbfd7d523bee95
 Path/gen_path.rs 490268d6bfb1635883b8bdefc683d59c4dd0e9c7f86c2e55954661efb3ab0253 490268d6bfb1635883b8bdefc683d59c4dd0e9c7f86c2e55954661efb3ab0253
-Path/gen_path_expr.rs a1e0ececfe62a63a43583c9bd8064a80a90c042c55bac29d86776c0c6559f33a a1e0ececfe62a63a43583c9bd8064a80a90c042c55bac29d86776c0c6559f33a
+Path/gen_path_expr.rs dcc9cc16cafff0e2225c1853a91612d3f666016c53fcb4ab5716ed31a33a41cd dcc9cc16cafff0e2225c1853a91612d3f666016c53fcb4ab5716ed31a33a41cd
 Path/gen_path_pat.rs fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371 fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371
-Path/gen_path_type.rs 210f2ce4000b59d2f908801c22c5497a0f0c9a3b1a5130e7dad0931430f49eb9 210f2ce4000b59d2f908801c22c5497a0f0c9a3b1a5130e7dad0931430f49eb9
+Path/gen_path_type_repr.rs 0cff40a38cf0201b70230ac3f1863728c0fa5f7099651fc437ae02824d12655b 0cff40a38cf0201b70230ac3f1863728c0fa5f7099651fc437ae02824d12655b
 PrefixExpr/gen_prefix_expr.rs c4b53e87f370713b9a9e257be26d082b0761497bac19b1d7401a31b22b30d1ab c4b53e87f370713b9a9e257be26d082b0761497bac19b1d7401a31b22b30d1ab
-PtrType/gen_ptr_type.rs dd7faad19454b92d7942ef664df1a5f26c01863e408b87249aa4d5d4f68c78b3 dd7faad19454b92d7942ef664df1a5f26c01863e408b87249aa4d5d4f68c78b3
+PtrTypeRepr/gen_ptr_type_repr.rs 290d64a8ab4e8946b2e37496e7d2837529135e99b61cfb16a98c00f4d6ff8679 290d64a8ab4e8946b2e37496e7d2837529135e99b61cfb16a98c00f4d6ff8679
 RangeExpr/gen_range_expr.rs 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0
 RangePat/gen_range_pat.rs 18b5169c3ab9230c95d86c4897f8343b2176d9602c9ea371c70c1eb0dbf89a28 18b5169c3ab9230c95d86c4897f8343b2176d9602c9ea371c70c1eb0dbf89a28
 RecordExpr/gen_record_expr.rs f8a7db88ae9e2a47588d26a76331cba64014dc6d5e065af28adcd718c8c52727 f8a7db88ae9e2a47588d26a76331cba64014dc6d5e065af28adcd718c8c52727
@@ -99,15 +99,15 @@ RecordPatField/gen_record_pat_field.rs f6c31bd08e6021aa4da6e8238561a77208f0ef723
 RecordPatFieldList/gen_record_pat_field_list.rs 35aa6ce694da1c822a593a9b1251e2a2c61365489edf2c0e9710251d8d02fe3f 35aa6ce694da1c822a593a9b1251e2a2c61365489edf2c0e9710251d8d02fe3f
 RefExpr/gen_ref_expr.rs 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6
 RefPat/gen_ref_pat.rs aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54 aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54
-RefType/gen_ref_type.rs 9d5c6d8257e580b550cbec5717e96b5cea6257c9e261e6f56db36c8570363b9d 9d5c6d8257e580b550cbec5717e96b5cea6257c9e261e6f56db36c8570363b9d
+RefTypeRepr/gen_ref_type_repr.rs 39a79cf148b7ee30e23a12c9349854dbe83aee1790153a388c43ff749907f8ea 39a79cf148b7ee30e23a12c9349854dbe83aee1790153a388c43ff749907f8ea
 Rename/gen_rename.rs 553c16f243d1ae3b6b28510d39436c83425944e5085171c18e0a2aa40deb74fc 553c16f243d1ae3b6b28510d39436c83425944e5085171c18e0a2aa40deb74fc
 RestPat/gen_rest_pat.rs e762bf7537225f97da751c5dca6a2cd3836ad7579b68c748b8c6cba65087acca e762bf7537225f97da751c5dca6a2cd3836ad7579b68c748b8c6cba65087acca
-RetType/gen_ret_type.rs 0947aed0974461b7a5b56bbc5fe36131663bde715c37302345d4eee23b71c825 0947aed0974461b7a5b56bbc5fe36131663bde715c37302345d4eee23b71c825
+RetTypeRepr/gen_ret_type_repr.rs 25edbd60ad63ab4266f6426ef50f1dd17e24132f5a24404d240a3f07daef6a31 25edbd60ad63ab4266f6426ef50f1dd17e24132f5a24404d240a3f07daef6a31
 ReturnExpr/gen_return_expr.rs 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f
 ReturnTypeSyntax/gen_return_type_syntax.rs 0b11a4cc400f9a2001996f99d61391bdb636e8aea036f587cf18ad6a957fe496 0b11a4cc400f9a2001996f99d61391bdb636e8aea036f587cf18ad6a957fe496
 SelfParam/gen_self_param.rs 9be528c454e2734292d54550f8850ae8e48e1558da46dcf7f06fc7a7a8c3e569 9be528c454e2734292d54550f8850ae8e48e1558da46dcf7f06fc7a7a8c3e569
 SlicePat/gen_slice_pat.rs df4a6692f5100aa11dd777561400ce71e37b85f2363b0638c21975a1771b15d5 df4a6692f5100aa11dd777561400ce71e37b85f2363b0638c21975a1771b15d5
-SliceType/gen_slice_type.rs 073282f4755994473933db7e4f1e4d34a80363d7e331299ec4ac1a2d6a235b86 073282f4755994473933db7e4f1e4d34a80363d7e331299ec4ac1a2d6a235b86
+SliceTypeRepr/gen_slice_type_repr.rs e50c142b7cf7bc3040ad64f351488557323d0b2fd5d004b41ed0fa8e522b5648 e50c142b7cf7bc3040ad64f351488557323d0b2fd5d004b41ed0fa8e522b5648
 SourceFile/gen_source_file.rs a7a1d4fa77b53adb6fbc031bf7ab49cf7c8787728ba0a687c348b5eefbb5b9df a7a1d4fa77b53adb6fbc031bf7ab49cf7c8787728ba0a687c348b5eefbb5b9df
 Static/gen_static.rs ff01782c2f0f702373fc6df45ac9277fbdd8d4fad69dbe5f984a14790a46e7b9 ff01782c2f0f702373fc6df45ac9277fbdd8d4fad69dbe5f984a14790a46e7b9
 StmtList/gen_stmt_list.rs bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad
@@ -121,7 +121,7 @@ TupleField/gen_tuple_field.rs 8a77f7f1c2e4ac4374a147c27db7789e80496b5a405fd9cc33
 TupleFieldList/gen_tuple_field_list.rs d2a5151b413be3edbf093c4f47a8d57945e794d399378971940f6a5c65d4c223 d2a5151b413be3edbf093c4f47a8d57945e794d399378971940f6a5c65d4c223
 TuplePat/gen_tuple_pat.rs b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148 b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148
 TupleStructPat/gen_tuple_struct_pat.rs 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98
-TupleType/gen_tuple_type.rs f4302ca264cb17e0c27015f657e678a13147f691c06323cba778836467815265 f4302ca264cb17e0c27015f657e678a13147f691c06323cba778836467815265
+TupleTypeRepr/gen_tuple_type_repr.rs 4ce074df3739c7614eae850d54d28f0ee4869d64ccc5736c5b73bed7800a0470 4ce074df3739c7614eae850d54d28f0ee4869d64ccc5736c5b73bed7800a0470
 TypeAlias/gen_type_alias.rs eee732f674d9f999fee1e1976c426ba07f23c63b58b3a53c2026a4b922c00c8f eee732f674d9f999fee1e1976c426ba07f23c63b58b3a53c2026a4b922c00c8f
 TypeArg/gen_type_arg.rs 11e024708429bb683adc848d0be168cd9d190793833880e6ec74139df296e818 11e024708429bb683adc848d0be168cd9d190793833880e6ec74139df296e818
 TypeBound/gen_type_bound.rs 4198346113b075812f79858ccbd467339d6b8039a449bd58c4710dd0aba1c9c1 4198346113b075812f79858ccbd467339d6b8039a449bd58c4710dd0aba1c9c1
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index 96f501b978d8..229d34da5d38 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -4,7 +4,7 @@
 /ArgList/gen_arg_list.rs linguist-generated
 /ArrayListExpr/gen_array_list_expr.rs linguist-generated
 /ArrayRepeatExpr/gen_array_repeat_expr.rs linguist-generated
-/ArrayType/gen_array_type.rs linguist-generated
+/ArrayTypeRepr/gen_array_type_repr.rs linguist-generated
 /AsmExpr/gen_asm_expr.rs linguist-generated
 /AssocTypeArg/gen_assoc_type_arg.rs linguist-generated
 /Attr/gen_attr.rs linguist-generated
@@ -24,16 +24,16 @@
 /ConstBlockPat/gen_const_block_pat.rs linguist-generated
 /ConstParam/gen_const_param.rs linguist-generated
 /ContinueExpr/gen_continue_expr.rs linguist-generated
-/DynTraitType/gen_dyn_trait_type.rs linguist-generated
+/DynTraitTypeRepr/gen_dyn_trait_type_repr.rs linguist-generated
 /Enum/gen_enum.rs linguist-generated
 /ExprStmt/gen_expr_stmt.rs linguist-generated
 /ExternBlock/gen_extern_block.rs linguist-generated
 /ExternCrate/gen_extern_crate.rs linguist-generated
 /ExternItemList/gen_extern_item_list.rs linguist-generated
 /FieldExpr/gen_field_expr.rs linguist-generated
-/FnPtrType/gen_fn_ptr_type.rs linguist-generated
+/FnPtrTypeRepr/gen_fn_ptr_type_repr.rs linguist-generated
 /ForExpr/gen_for_expr.rs linguist-generated
-/ForType/gen_for_type.rs linguist-generated
+/ForTypeRepr/gen_for_type_repr.rs linguist-generated
 /FormatArgsExpr/gen_format.rs linguist-generated
 /FormatArgsExpr/gen_format_args_arg.rs linguist-generated
 /FormatArgsExpr/gen_format_args_expr.rs linguist-generated
@@ -44,9 +44,9 @@
 /IdentPat/gen_ident_pat.rs linguist-generated
 /IfExpr/gen_if_expr.rs linguist-generated
 /Impl/gen_impl.rs linguist-generated
-/ImplTraitType/gen_impl_trait_type.rs linguist-generated
+/ImplTraitTypeRepr/gen_impl_trait_type_repr.rs linguist-generated
 /IndexExpr/gen_index_expr.rs linguist-generated
-/InferType/gen_infer_type.rs linguist-generated
+/InferTypeRepr/gen_infer_type_repr.rs linguist-generated
 /ItemList/gen_item_list.rs linguist-generated
 /Label/gen_label.rs linguist-generated
 /LetElse/gen_let_else.rs linguist-generated
@@ -65,7 +65,7 @@
 /MacroPat/gen_macro_pat.rs linguist-generated
 /MacroRules/gen_macro_rules.rs linguist-generated
 /MacroStmts/gen_macro_stmts.rs linguist-generated
-/MacroType/gen_macro_type.rs linguist-generated
+/MacroTypeRepr/gen_macro_type_repr.rs linguist-generated
 /MatchArm/gen_match_arm.rs linguist-generated
 /MatchArmList/gen_match_arm_list.rs linguist-generated
 /MatchExpr/gen_match_expr.rs linguist-generated
@@ -75,20 +75,20 @@
 /Module/gen_module.rs linguist-generated
 /Name/gen_name.rs linguist-generated
 /NameRef/gen_name_ref.rs linguist-generated
-/NeverType/gen_never_type.rs linguist-generated
+/NeverTypeRepr/gen_never_type_repr.rs linguist-generated
 /OffsetOfExpr/gen_offset_of_expr.rs linguist-generated
 /OrPat/gen_or_pat.rs linguist-generated
 /Param/gen_param.rs linguist-generated
 /ParamList/gen_param_list.rs linguist-generated
 /ParenExpr/gen_paren_expr.rs linguist-generated
 /ParenPat/gen_paren_pat.rs linguist-generated
-/ParenType/gen_paren_type.rs linguist-generated
+/ParenTypeRepr/gen_paren_type_repr.rs linguist-generated
 /Path/gen_path.rs linguist-generated
 /Path/gen_path_expr.rs linguist-generated
 /Path/gen_path_pat.rs linguist-generated
-/Path/gen_path_type.rs linguist-generated
+/Path/gen_path_type_repr.rs linguist-generated
 /PrefixExpr/gen_prefix_expr.rs linguist-generated
-/PtrType/gen_ptr_type.rs linguist-generated
+/PtrTypeRepr/gen_ptr_type_repr.rs linguist-generated
 /RangeExpr/gen_range_expr.rs linguist-generated
 /RangePat/gen_range_pat.rs linguist-generated
 /RecordExpr/gen_record_expr.rs linguist-generated
@@ -101,15 +101,15 @@
 /RecordPatFieldList/gen_record_pat_field_list.rs linguist-generated
 /RefExpr/gen_ref_expr.rs linguist-generated
 /RefPat/gen_ref_pat.rs linguist-generated
-/RefType/gen_ref_type.rs linguist-generated
+/RefTypeRepr/gen_ref_type_repr.rs linguist-generated
 /Rename/gen_rename.rs linguist-generated
 /RestPat/gen_rest_pat.rs linguist-generated
-/RetType/gen_ret_type.rs linguist-generated
+/RetTypeRepr/gen_ret_type_repr.rs linguist-generated
 /ReturnExpr/gen_return_expr.rs linguist-generated
 /ReturnTypeSyntax/gen_return_type_syntax.rs linguist-generated
 /SelfParam/gen_self_param.rs linguist-generated
 /SlicePat/gen_slice_pat.rs linguist-generated
-/SliceType/gen_slice_type.rs linguist-generated
+/SliceTypeRepr/gen_slice_type_repr.rs linguist-generated
 /SourceFile/gen_source_file.rs linguist-generated
 /Static/gen_static.rs linguist-generated
 /StmtList/gen_stmt_list.rs linguist-generated
@@ -123,7 +123,7 @@
 /TupleFieldList/gen_tuple_field_list.rs linguist-generated
 /TuplePat/gen_tuple_pat.rs linguist-generated
 /TupleStructPat/gen_tuple_struct_pat.rs linguist-generated
-/TupleType/gen_tuple_type.rs linguist-generated
+/TupleTypeRepr/gen_tuple_type_repr.rs linguist-generated
 /TypeAlias/gen_type_alias.rs linguist-generated
 /TypeArg/gen_type_arg.rs linguist-generated
 /TypeBound/gen_type_bound.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.ql b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.ql
deleted file mode 100644
index 1538043e2922..000000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ArrayType x, string hasConstArg, string hasTy
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasConstArg() then hasConstArg = "yes" else hasConstArg = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasConstArg:", hasConstArg, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/gen_array_type.rs b/rust/ql/test/extractor-tests/generated/ArrayType/gen_array_type.rs
deleted file mode 100644
index 2449a2052274..000000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayType/gen_array_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_array_type() -> () {
-    // A ArrayType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.expected b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.expected
rename to rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql
new file mode 100644
index 000000000000..5ec3d499addc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayTypeRepr x, string hasConstArg, string hasElementTypeRepr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasConstArg() then hasConstArg = "yes" else hasConstArg = "no") and
+  if x.hasElementTypeRepr() then hasElementTypeRepr = "yes" else hasElementTypeRepr = "no"
+select x, "hasConstArg:", hasConstArg, "hasElementTypeRepr:", hasElementTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.expected b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.expected
rename to rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.expected
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql
rename to rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql
index 55c3fc89475c..f89dc93f5b83 100644
--- a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql
+++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ArrayType x
+from ArrayTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getConstArg()
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.expected b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql
new file mode 100644
index 000000000000..f343cbd19c99
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getElementTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/gen_array_type_repr.rs b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/gen_array_type_repr.rs
new file mode 100644
index 000000000000..118b02860340
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/gen_array_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_array_type_repr() -> () {
+    // A ArrayTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
index b1cafa773f51..f1161ef7094f 100644
--- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   AssocTypeArg x, string hasConstArg, string hasGenericArgList, string hasNameRef,
-  string hasParamList, string hasRetType, string hasReturnTypeSyntax, string hasTy,
+  string hasParamList, string hasRetType, string hasReturnTypeSyntax, string hasTypeRepr,
   string hasTypeBoundList
 where
   toBeTested(x) and
@@ -15,8 +15,8 @@ where
   (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
   (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
   (if x.hasReturnTypeSyntax() then hasReturnTypeSyntax = "yes" else hasReturnTypeSyntax = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
 select x, "hasConstArg:", hasConstArg, "hasGenericArgList:", hasGenericArgList, "hasNameRef:",
   hasNameRef, "hasParamList:", hasParamList, "hasRetType:", hasRetType, "hasReturnTypeSyntax:",
-  hasReturnTypeSyntax, "hasTy:", hasTy, "hasTypeBoundList:", hasTypeBoundList
+  hasReturnTypeSyntax, "hasTypeRepr:", hasTypeRepr, "hasTypeBoundList:", hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.expected
rename to rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql
rename to rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql
index 4b037c90ab25..0e4d81812edf 100644
--- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from AssocTypeArg x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
index c85e41866313..76e6f567b061 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
@@ -1 +1 @@
-| gen_cast_expr.rs:5:5:5:16 | value as u64 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasTy: | yes |
+| gen_cast_expr.rs:5:5:5:16 | value as u64 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasTypeRepr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
index d7db68cfdf2b..0c60d9f8c4e2 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from CastExpr x, int getNumberOfAttrs, string hasExpr, string hasTy
+from CastExpr x, int getNumberOfAttrs, string hasExpr, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected
rename to rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql
rename to rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql
index 68b6f5126f43..34ee4c5ef9df 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from CastExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
index d7ec1024953c..d5b2095eaccf 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
@@ -1 +1 @@
-| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:19:6:24 | RetType |
+| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:19:6:24 | RetTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql
index 125943f40a04..f1509aac3689 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   Const x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
-  string hasBody, string isConst, string isDefault, string hasName, string hasTy,
+  string hasBody, string isConst, string isDefault, string hasName, string hasTypeRepr,
   string hasVisibility
 where
   toBeTested(x) and
@@ -20,8 +20,8 @@ where
   (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
   "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isConst:", isConst, "isDefault:",
-  isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility
+  isDefault, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getTy.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/Const/Const_getTy.expected
rename to rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getTy.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/Const/Const_getTy.ql
rename to rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.ql
index d133dcb5d384..4185581df19d 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from Const x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
index 5988a54b4d1b..4f7fbab909ee 100644
--- a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   ConstParam x, int getNumberOfAttrs, string hasDefaultVal, string isConst, string hasName,
-  string hasTy
+  string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -12,6 +12,6 @@ where
   (if x.hasDefaultVal() then hasDefaultVal = "yes" else hasDefaultVal = "no") and
   (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
 select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasDefaultVal:", hasDefaultVal, "isConst:",
-  isConst, "hasName:", hasName, "hasTy:", hasTy
+  isConst, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.expected b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.expected
rename to rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql
rename to rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql
index 9f9aa53542bf..d789f9eb1445 100644
--- a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from ConstParam x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/gen_dyn_trait_type.rs b/rust/ql/test/extractor-tests/generated/DynTraitType/gen_dyn_trait_type.rs
deleted file mode 100644
index 511d9b782c09..000000000000
--- a/rust/ql/test/extractor-tests/generated/DynTraitType/gen_dyn_trait_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_dyn_trait_type() -> () {
-    // A DynTraitType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.expected b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.expected
rename to rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.ql b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.ql
rename to rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql
index ad7a7e7101e5..c67812dec36f 100644
--- a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.ql
+++ b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from DynTraitType x, string hasTypeBoundList
+from DynTraitTypeRepr x, string hasTypeBoundList
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.expected
rename to rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.expected
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql
rename to rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql
index bd63c4c6e3b9..f9c215991a33 100644
--- a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql
+++ b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from DynTraitType x
+from DynTraitTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/gen_dyn_trait_type_repr.rs b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/gen_dyn_trait_type_repr.rs
new file mode 100644
index 000000000000..24d4fec81e46
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/gen_dyn_trait_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_dyn_trait_type_repr() -> () {
+    // A DynTraitTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/gen_fn_ptr_type.rs b/rust/ql/test/extractor-tests/generated/FnPtrType/gen_fn_ptr_type.rs
deleted file mode 100644
index 6f58b0cc5203..000000000000
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/gen_fn_ptr_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_fn_ptr_type() -> () {
-    // A FnPtrType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.expected b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.expected
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql
index 83cf90dec0a0..a3f3b81fcde8 100644
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql
@@ -3,8 +3,8 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  FnPtrType x, string hasAbi, string isAsync, string isConst, string isUnsafe, string hasParamList,
-  string hasRetType
+  FnPtrTypeRepr x, string hasAbi, string isAsync, string isConst, string isUnsafe,
+  string hasParamList, string hasRetType
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.expected b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.expected
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.expected
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql
index cfe7f4ba6fc7..738031ddf22e 100644
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from FnPtrType x
+from FnPtrTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getAbi()
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.expected b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.expected
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.expected
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql
index 718885c3be08..bc5b5d935ca8 100644
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from FnPtrType x
+from FnPtrTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getParamList()
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.expected b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.expected
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.expected
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql
index 39bece0dbebb..a0bd1df08d9c 100644
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from FnPtrType x
+from FnPtrTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getRetType()
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/gen_fn_ptr_type_repr.rs b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/gen_fn_ptr_type_repr.rs
new file mode 100644
index 000000000000..d8c07124d104
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/gen_fn_ptr_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_fn_ptr_type_repr() -> () {
+    // A FnPtrTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.ql b/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.ql
deleted file mode 100644
index 4ed564967a12..000000000000
--- a/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ForType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/ForType/gen_for_type.rs b/rust/ql/test/extractor-tests/generated/ForType/gen_for_type.rs
deleted file mode 100644
index f44e4411a047..000000000000
--- a/rust/ql/test/extractor-tests/generated/ForType/gen_for_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_for_type() -> () {
-    // A ForType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType.expected b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType.expected
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType.ql b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
similarity index 51%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType.ql
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
index fd98b365bfc0..5cb8aeecde1f 100644
--- a/rust/ql/test/extractor-tests/generated/ForType/ForType.ql
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
@@ -2,10 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from ForType x, string hasGenericParamList, string hasTy
+from ForTypeRepr x, string hasGenericParamList, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasGenericParamList:", hasGenericParamList, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasGenericParamList:", hasGenericParamList, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.expected
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.expected
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql
similarity index 89%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql
index 7a2c53aba83a..3ee936fca2ad 100644
--- a/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ForType x
+from ForTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.expected b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql
similarity index 73%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql
index d274baf857f0..677f61b023da 100644
--- a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ArrayType x
+from ForTypeRepr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs b/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
new file mode 100644
index 000000000000..5e1c39e49c38
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_for_type_repr() -> () {
+    // A ForTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected
index bd225b268e84..f9778c63c7ef 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected
@@ -1 +1 @@
-| gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:16:4:21 | RetType |
+| gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:16:4:21 | RetTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/gen_impl_trait_type.rs b/rust/ql/test/extractor-tests/generated/ImplTraitType/gen_impl_trait_type.rs
deleted file mode 100644
index 3f50d59edbd3..000000000000
--- a/rust/ql/test/extractor-tests/generated/ImplTraitType/gen_impl_trait_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_impl_trait_type() -> () {
-    // A ImplTraitType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.expected b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.expected
rename to rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql
rename to rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql
index d4cfdef4778c..8ff70bd976db 100644
--- a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from ImplTraitType x, string hasTypeBoundList
+from ImplTraitTypeRepr x, string hasTypeBoundList
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.expected
rename to rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.expected
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql
rename to rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql
index 132a6001355f..32c100f19075 100644
--- a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ImplTraitType x
+from ImplTraitTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/gen_impl_trait_type_repr.rs b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/gen_impl_trait_type_repr.rs
new file mode 100644
index 000000000000..36404a83f848
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/gen_impl_trait_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_impl_trait_type_repr() -> () {
+    // A ImplTraitTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/InferType/gen_infer_type.rs b/rust/ql/test/extractor-tests/generated/InferType/gen_infer_type.rs
deleted file mode 100644
index c65f65c22306..000000000000
--- a/rust/ql/test/extractor-tests/generated/InferType/gen_infer_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_infer_type() -> () {
-    // A InferType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/InferType/InferType.expected b/rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/InferType/InferType.expected
rename to rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/InferType/InferType.ql b/rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/InferType/InferType.ql
rename to rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql
index 88b42a4d53f6..97f91c3307ef 100644
--- a/rust/ql/test/extractor-tests/generated/InferType/InferType.ql
+++ b/rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from InferType x
+from InferTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x
diff --git a/rust/ql/test/extractor-tests/generated/InferTypeRepr/gen_infer_type_repr.rs b/rust/ql/test/extractor-tests/generated/InferTypeRepr/gen_infer_type_repr.rs
new file mode 100644
index 000000000000..a1be7a78f21f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/InferTypeRepr/gen_infer_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_infer_type_repr() -> () {
+    // A InferTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
index 847ff988ff0d..8f01e57d3e95 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
@@ -1,6 +1,6 @@
-| gen_let_stmt.rs:5:5:5:15 | let ... = 42 | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | no |
-| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | yes |
-| gen_let_stmt.rs:7:5:7:15 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTy: | yes |
-| gen_let_stmt.rs:8:5:8:10 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTy: | no |
-| gen_let_stmt.rs:9:5:9:24 | let ... = ... | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | no |
-| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | yes | hasPat: | yes | hasTy: | no |
+| gen_let_stmt.rs:5:5:5:15 | let ... = 42 | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | no |
+| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | yes |
+| gen_let_stmt.rs:7:5:7:15 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | yes |
+| gen_let_stmt.rs:8:5:8:10 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | no |
+| gen_let_stmt.rs:9:5:9:24 | let ... = ... | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | no |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | yes | hasPat: | yes | hasTypeRepr: | no |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
index bd7ce9ad9588..0501354dfa1e 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   LetStmt x, int getNumberOfAttrs, string hasInitializer, string hasLetElse, string hasPat,
-  string hasTy
+  string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -12,6 +12,6 @@ where
   (if x.hasInitializer() then hasInitializer = "yes" else hasInitializer = "no") and
   (if x.hasLetElse() then hasLetElse = "yes" else hasLetElse = "no") and
   (if x.hasPat() then hasPat = "yes" else hasPat = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
 select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasInitializer:", hasInitializer, "hasLetElse:",
-  hasLetElse, "hasPat:", hasPat, "hasTy:", hasTy
+  hasLetElse, "hasPat:", hasPat, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected
rename to rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql
rename to rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql
index 507c43a5619d..7c5a8872bc31 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from LetStmt x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
index f0508f1853fe..d977579474b2 100644
--- a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
@@ -18,9 +18,9 @@ noLocation
 | file://:0:0:0:0 | Path |
 | file://:0:0:0:0 | Path |
 | file://:0:0:0:0 | Path |
-| file://:0:0:0:0 | RefType |
-| file://:0:0:0:0 | RefType |
-| file://:0:0:0:0 | RetType |
+| file://:0:0:0:0 | RefTypeRepr |
+| file://:0:0:0:0 | RefTypeRepr |
+| file://:0:0:0:0 | RetTypeRepr |
 | file://:0:0:0:0 | StmtList |
 | file://:0:0:0:0 | Use |
 | file://:0:0:0:0 | UseTree |
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/gen_macro_type.rs b/rust/ql/test/extractor-tests/generated/MacroType/gen_macro_type.rs
deleted file mode 100644
index 31f93e580a21..000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroType/gen_macro_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_macro_type() -> () {
-    // A MacroType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType.expected b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/MacroType/MacroType.expected
rename to rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType.ql b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql
similarity index 85%
rename from rust/ql/test/extractor-tests/generated/MacroType/MacroType.ql
rename to rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql
index 6fcbdc8617a1..466d4cf04054 100644
--- a/rust/ql/test/extractor-tests/generated/MacroType/MacroType.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from MacroType x, string hasMacroCall
+from MacroTypeRepr x, string hasMacroCall
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.expected
rename to rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.expected
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql
rename to rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql
index d7c5035f79b6..22aa72d039bb 100644
--- a/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from MacroType x
+from MacroTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getMacroCall()
diff --git a/rust/ql/test/extractor-tests/generated/MacroTypeRepr/gen_macro_type_repr.rs b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/gen_macro_type_repr.rs
new file mode 100644
index 000000000000..60b382ca8782
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/gen_macro_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_macro_type_repr() -> () {
+    // A MacroTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/gen_never_type.rs b/rust/ql/test/extractor-tests/generated/NeverType/gen_never_type.rs
deleted file mode 100644
index f84b6dc6c0ad..000000000000
--- a/rust/ql/test/extractor-tests/generated/NeverType/gen_never_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_never_type() -> () {
-    // A NeverType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/NeverType.expected b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/NeverType/NeverType.expected
rename to rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/NeverType.ql b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/NeverType/NeverType.ql
rename to rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql
index b093d5f1ee5b..71ab05928dff 100644
--- a/rust/ql/test/extractor-tests/generated/NeverType/NeverType.ql
+++ b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from NeverType x
+from NeverTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x
diff --git a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/gen_never_type_repr.rs b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/gen_never_type_repr.rs
new file mode 100644
index 000000000000..203a3b749dc1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/gen_never_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_never_type_repr() -> () {
+    // A NeverTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
index 1e53040c6cb2..4f8705ab0da4 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
@@ -1 +1 @@
-| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 1 | hasTy: | yes |
+| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 1 | hasTypeRepr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
index 9161ff35a93b..afcd0de84df1 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
@@ -2,12 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from OffsetOfExpr x, int getNumberOfAttrs, int getNumberOfFields, string hasTy
+from OffsetOfExpr x, int getNumberOfAttrs, int getNumberOfFields, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   getNumberOfFields = x.getNumberOfFields() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfFields:", getNumberOfFields, "hasTy:",
-  hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfFields:", getNumberOfFields,
+  "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected
rename to rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql
rename to rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql
index 4ab524b18c7f..5f2a647d8077 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from OffsetOfExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param.expected b/rust/ql/test/extractor-tests/generated/Param/Param.expected
index e0f54f135831..c8218bdaec5e 100644
--- a/rust/ql/test/extractor-tests/generated/Param/Param.expected
+++ b/rust/ql/test/extractor-tests/generated/Param/Param.expected
@@ -1 +1 @@
-| gen_param.rs:5:12:5:15 | ...: T | getNumberOfAttrs: | 0 | hasTy: | yes | hasPat: | yes |
+| gen_param.rs:5:12:5:15 | ...: T | getNumberOfAttrs: | 0 | hasTypeRepr: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param.ql b/rust/ql/test/extractor-tests/generated/Param/Param.ql
index 1e744bae58b6..c471f2aeb393 100644
--- a/rust/ql/test/extractor-tests/generated/Param/Param.ql
+++ b/rust/ql/test/extractor-tests/generated/Param/Param.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from Param x, int getNumberOfAttrs, string hasTy, string hasPat
+from Param x, int getNumberOfAttrs, string hasTypeRepr, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasPat() then hasPat = "yes" else hasPat = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTy:", hasTy, "hasPat:", hasPat
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTypeRepr:", hasTypeRepr, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getTy.expected b/rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/Param/Param_getTy.expected
rename to rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getTy.ql b/rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/Param/Param_getTy.ql
rename to rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.ql
index 360f8b65bd7d..0e03e4b51185 100644
--- a/rust/ql/test/extractor-tests/generated/Param/Param_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from Param x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType.ql b/rust/ql/test/extractor-tests/generated/ParenType/ParenType.ql
deleted file mode 100644
index e704767d6314..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenType/ParenType.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ParenType x, string hasTy
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.ql b/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.ql
deleted file mode 100644
index b472d03f718c..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ParenType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/gen_paren_type.rs b/rust/ql/test/extractor-tests/generated/ParenType/gen_paren_type.rs
deleted file mode 100644
index ad07406451be..000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenType/gen_paren_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_paren_type() -> () {
-    // A ParenType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType.expected b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ParenType/ParenType.expected
rename to rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql
new file mode 100644
index 000000000000..83a4f846add1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenTypeRepr x, string hasTypeRepr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.expected b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql
new file mode 100644
index 000000000000..2b3a274fc089
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/gen_paren_type_repr.rs b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/gen_paren_type_repr.rs
new file mode 100644
index 000000000000..9e2577009dab
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/gen_paren_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_paren_type_repr() -> () {
+    // A ParenTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.expected b/rust/ql/test/extractor-tests/generated/Path/Path.expected
index dfc303c3293c..7159a6d1f4e5 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path.expected
@@ -10,17 +10,17 @@
 | gen_path_expr.rs:7:13:7:20 | ...::foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
 | gen_path_expr.rs:7:14:7:14 | T | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
 | gen_path_expr.rs:7:14:7:14 | T | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
-| gen_path_expr.rs:8:13:8:30 | <...> | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
-| gen_path_expr.rs:8:13:8:35 | ...::foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:8:13:8:31 | <...> | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
 | gen_path_pat.rs:5:11:5:11 | x | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
 | gen_path_pat.rs:6:9:6:11 | Foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
 | gen_path_pat.rs:6:9:6:16 | ...::Bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
-| gen_path_type.rs:5:14:5:16 | std | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
-| gen_path_type.rs:5:14:5:29 | ...::collections | hasResolvedPath: | yes | hasResolvedCrateOrigin: | yes | hasQualifier: | yes | hasPart: | yes |
-| gen_path_type.rs:5:14:5:48 | ...::HashMap::<...> | hasResolvedPath: | yes | hasResolvedCrateOrigin: | yes | hasQualifier: | yes | hasPart: | yes |
-| gen_path_type.rs:5:40:5:42 | i32 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
-| gen_path_type.rs:5:45:5:47 | i32 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
-| gen_path_type.rs:6:14:6:14 | X | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
-| gen_path_type.rs:6:14:6:20 | ...::Item | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path_type_repr.rs:5:14:5:16 | std | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | hasResolvedPath: | yes | hasResolvedCrateOrigin: | yes | hasQualifier: | yes | hasPart: | yes |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | hasResolvedPath: | yes | hasResolvedCrateOrigin: | yes | hasQualifier: | yes | hasPart: | yes |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_type_repr.rs:6:14:6:14 | X | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
index 4f6def5dd438..4cfbc41c3c29 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
@@ -2,5 +2,5 @@
 | gen_path_expr.rs:5:13:5:20 | variable | getNumberOfAttrs: | 0 | hasPath: | yes |
 | gen_path_expr.rs:6:13:6:20 | ...::bar | getNumberOfAttrs: | 0 | hasPath: | yes |
 | gen_path_expr.rs:7:13:7:20 | ...::foo | getNumberOfAttrs: | 0 | hasPath: | yes |
-| gen_path_expr.rs:8:13:8:35 | ...::foo | getNumberOfAttrs: | 0 | hasPath: | yes |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | getNumberOfAttrs: | 0 | hasPath: | yes |
 | gen_path_pat.rs:5:11:5:11 | x | getNumberOfAttrs: | 0 | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/Path/PathExpr_getPath.expected
index 31b98a6a8ecf..e9680024dc1c 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathExpr_getPath.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr_getPath.expected
@@ -2,5 +2,5 @@
 | gen_path_expr.rs:5:13:5:20 | variable | gen_path_expr.rs:5:13:5:20 | variable |
 | gen_path_expr.rs:6:13:6:20 | ...::bar | gen_path_expr.rs:6:13:6:20 | ...::bar |
 | gen_path_expr.rs:7:13:7:20 | ...::foo | gen_path_expr.rs:7:13:7:20 | ...::foo |
-| gen_path_expr.rs:8:13:8:35 | ...::foo | gen_path_expr.rs:8:13:8:35 | ...::foo |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | gen_path_expr.rs:8:13:8:36 | ...::foo |
 | gen_path_pat.rs:5:11:5:11 | x | gen_path_pat.rs:5:11:5:11 | x |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected
index 8278d7685dc3..1180aa8dd656 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected
@@ -1,26 +1,26 @@
-| gen_path.rs:5:9:5:18 | some_crate | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path.rs:5:21:5:31 | some_module | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path.rs:5:34:5:42 | some_item | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path.rs:6:5:6:7 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path.rs:6:10:6:12 | bar | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_expr.rs:5:13:5:20 | variable | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_expr.rs:6:13:6:15 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_expr.rs:6:18:6:20 | bar | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_expr.rs:7:13:7:15 | <...> | hasGenericArgList: | no | hasNameRef: | no | hasParamList: | no | hasPathType: | yes | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | yes |
-| gen_path_expr.rs:7:14:7:14 | T | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_expr.rs:7:14:7:14 | T | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_expr.rs:7:18:7:20 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_expr.rs:8:13:8:30 | <...> | hasGenericArgList: | no | hasNameRef: | no | hasParamList: | no | hasPathType: | yes | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | yes |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_expr.rs:8:33:8:35 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_pat.rs:5:11:5:11 | x | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_pat.rs:6:9:6:11 | Foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_pat.rs:6:14:6:16 | Bar | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_type.rs:5:14:5:16 | std | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_type.rs:5:19:5:29 | collections | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_type.rs:5:32:5:48 | HashMap::<...> | hasGenericArgList: | yes | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_type.rs:5:40:5:42 | i32 | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_type.rs:5:45:5:47 | i32 | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_type.rs:6:14:6:14 | X | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_type.rs:6:17:6:20 | Item | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
+| gen_path.rs:5:9:5:18 | some_crate | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path.rs:5:21:5:31 | some_module | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path.rs:5:34:5:42 | some_item | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path.rs:6:5:6:7 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path.rs:6:10:6:12 | bar | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:5:13:5:20 | variable | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:6:13:6:15 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:6:18:6:20 | bar | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:7:13:7:15 | <...> | hasGenericArgList: | no | hasNameRef: | no | hasParamList: | no | hasPathType: | yes | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes |
+| gen_path_expr.rs:7:14:7:14 | T | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:7:14:7:14 | T | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:7:18:7:20 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:8:13:8:31 | <...> | hasGenericArgList: | no | hasNameRef: | no | hasParamList: | no | hasPathType: | yes | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:8:34:8:36 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_pat.rs:5:11:5:11 | x | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_pat.rs:6:9:6:11 | Foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_pat.rs:6:14:6:16 | Bar | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:14:5:16 | std | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:19:5:29 | collections | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | hasGenericArgList: | yes | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:6:14:6:14 | X | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:6:17:6:20 | Item | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql
index cf18bedaced3..3ac8218cf0bf 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   PathSegment x, string hasGenericArgList, string hasNameRef, string hasParamList,
-  string hasPathType, string hasRetType, string hasReturnTypeSyntax, string hasTy
+  string hasPathType, string hasRetType, string hasReturnTypeSyntax, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -14,7 +14,7 @@ where
   (if x.hasPathType() then hasPathType = "yes" else hasPathType = "no") and
   (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
   (if x.hasReturnTypeSyntax() then hasReturnTypeSyntax = "yes" else hasReturnTypeSyntax = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
 select x, "hasGenericArgList:", hasGenericArgList, "hasNameRef:", hasNameRef, "hasParamList:",
   hasParamList, "hasPathType:", hasPathType, "hasRetType:", hasRetType, "hasReturnTypeSyntax:",
-  hasReturnTypeSyntax, "hasTy:", hasTy
+  hasReturnTypeSyntax, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.expected
index 7487eb65c84c..ff0110440aef 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.expected
@@ -1 +1 @@
-| gen_path_type.rs:5:32:5:48 | HashMap::<...> | gen_path_type.rs:5:39:5:48 | <...> |
+| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | gen_path_type_repr.rs:5:39:5:48 | <...> |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.expected
index 8778f6b4aefd..483cf12a3785 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.expected
@@ -9,16 +9,16 @@
 | gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
 | gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
 | gen_path_expr.rs:7:18:7:20 | foo | gen_path_expr.rs:7:18:7:20 | foo |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | gen_path_expr.rs:8:14:8:20 | TypeRef |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | gen_path_expr.rs:8:14:8:20 | TypeRef |
-| gen_path_expr.rs:8:33:8:35 | foo | gen_path_expr.rs:8:33:8:35 | foo |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_expr.rs:8:34:8:36 | foo | gen_path_expr.rs:8:34:8:36 | foo |
 | gen_path_pat.rs:5:11:5:11 | x | gen_path_pat.rs:5:11:5:11 | x |
 | gen_path_pat.rs:6:9:6:11 | Foo | gen_path_pat.rs:6:9:6:11 | Foo |
 | gen_path_pat.rs:6:14:6:16 | Bar | gen_path_pat.rs:6:14:6:16 | Bar |
-| gen_path_type.rs:5:14:5:16 | std | gen_path_type.rs:5:14:5:16 | std |
-| gen_path_type.rs:5:19:5:29 | collections | gen_path_type.rs:5:19:5:29 | collections |
-| gen_path_type.rs:5:32:5:48 | HashMap::<...> | gen_path_type.rs:5:32:5:38 | HashMap |
-| gen_path_type.rs:5:40:5:42 | i32 | gen_path_type.rs:5:40:5:42 | i32 |
-| gen_path_type.rs:5:45:5:47 | i32 | gen_path_type.rs:5:45:5:47 | i32 |
-| gen_path_type.rs:6:14:6:14 | X | gen_path_type.rs:6:14:6:14 | X |
-| gen_path_type.rs:6:17:6:20 | Item | gen_path_type.rs:6:17:6:20 | Item |
+| gen_path_type_repr.rs:5:14:5:16 | std | gen_path_type_repr.rs:5:14:5:16 | std |
+| gen_path_type_repr.rs:5:19:5:29 | collections | gen_path_type_repr.rs:5:19:5:29 | collections |
+| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | gen_path_type_repr.rs:5:32:5:38 | HashMap |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | gen_path_type_repr.rs:5:40:5:42 | i32 |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | gen_path_type_repr.rs:5:45:5:47 | i32 |
+| gen_path_type_repr.rs:6:14:6:14 | X | gen_path_type_repr.rs:6:14:6:14 | X |
+| gen_path_type_repr.rs:6:17:6:20 | Item | gen_path_type_repr.rs:6:17:6:20 | Item |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected
index db25db90b83e..99ac97381b3c 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected
@@ -1,2 +1,2 @@
 | gen_path_expr.rs:7:13:7:15 | <...> | gen_path_expr.rs:7:14:7:14 | T |
-| gen_path_expr.rs:8:13:8:30 | <...> | gen_path_expr.rs:8:14:8:20 | TypeRef |
+| gen_path_expr.rs:8:13:8:31 | <...> | gen_path_expr.rs:8:14:8:21 | TypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTy.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTy.expected
deleted file mode 100644
index db25db90b83e..000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTy.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_path_expr.rs:7:13:7:15 | <...> | gen_path_expr.rs:7:14:7:14 | T |
-| gen_path_expr.rs:8:13:8:30 | <...> | gen_path_expr.rs:8:14:8:20 | TypeRef |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.expected
new file mode 100644
index 000000000000..99ac97381b3c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.expected
@@ -0,0 +1,2 @@
+| gen_path_expr.rs:7:13:7:15 | <...> | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:8:13:8:31 | <...> | gen_path_expr.rs:8:14:8:21 | TypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTy.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/Path/PathSegment_getTy.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql
index 6445000c2a47..98303f7f0fb1 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from PathSegment x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathType.expected b/rust/ql/test/extractor-tests/generated/Path/PathType.expected
deleted file mode 100644
index 7d876dc4fa8d..000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/PathType.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
-| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | hasPath: | yes |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | hasPath: | yes |
-| gen_path_type.rs:5:14:5:48 | ...::HashMap::<...> | hasPath: | yes |
-| gen_path_type.rs:5:40:5:42 | i32 | hasPath: | yes |
-| gen_path_type.rs:5:45:5:47 | i32 | hasPath: | yes |
-| gen_path_type.rs:6:14:6:20 | ...::Item | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRef.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRef.expected
new file mode 100644
index 000000000000..08c6bcb966d8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRef.expected
@@ -0,0 +1,8 @@
+| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
+| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
+| gen_path_expr.rs:8:14:8:20 | TypeRepr | hasPath: | yes |
+| gen_path_expr.rs:8:14:8:20 | TypeRepr | hasPath: | yes |
+| gen_path_type_ref.rs:5:14:5:48 | ...::HashMap::<...> | hasPath: | yes |
+| gen_path_type_ref.rs:5:40:5:42 | i32 | hasPath: | yes |
+| gen_path_type_ref.rs:5:45:5:47 | i32 | hasPath: | yes |
+| gen_path_type_ref.rs:6:14:6:20 | ...::Item | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRef_getPath.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRef_getPath.expected
new file mode 100644
index 000000000000..1c4f84c6a60b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRef_getPath.expected
@@ -0,0 +1,8 @@
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:8:14:8:20 | TypeRepr | gen_path_expr.rs:8:14:8:20 | TypeRepr |
+| gen_path_expr.rs:8:14:8:20 | TypeRepr | gen_path_expr.rs:8:14:8:20 | TypeRepr |
+| gen_path_type_ref.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type_ref.rs:5:14:5:48 | ...::HashMap::<...> |
+| gen_path_type_ref.rs:5:40:5:42 | i32 | gen_path_type_ref.rs:5:40:5:42 | i32 |
+| gen_path_type_ref.rs:5:45:5:47 | i32 | gen_path_type_ref.rs:5:45:5:47 | i32 |
+| gen_path_type_ref.rs:6:14:6:20 | ...::Item | gen_path_type_ref.rs:6:14:6:20 | ...::Item |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected
new file mode 100644
index 000000000000..0cb1fa81a141
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected
@@ -0,0 +1,8 @@
+| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
+| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasPath: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasPath: | yes |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | hasPath: | yes |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | hasPath: | yes |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | hasPath: | yes |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathType.ql b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql
similarity index 85%
rename from rust/ql/test/extractor-tests/generated/Path/PathType.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql
index a064955c56fe..0be55070a1b0 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathType.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from PathType x, string hasPath
+from PathTypeRepr x, string hasPath
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.expected
new file mode 100644
index 000000000000..ab0145486a95
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.expected
@@ -0,0 +1,8 @@
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | gen_path_type_repr.rs:5:40:5:42 | i32 |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | gen_path_type_repr.rs:5:45:5:47 | i32 |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | gen_path_type_repr.rs:6:14:6:20 | ...::Item |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathType_getPath.ql b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql
similarity index 88%
rename from rust/ql/test/extractor-tests/generated/Path/PathType_getPath.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql
index 991efc310379..b90c858b4cf9 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathType_getPath.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from PathType x
+from PathTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathType_getPath.expected b/rust/ql/test/extractor-tests/generated/Path/PathType_getPath.expected
deleted file mode 100644
index 879ed298b93f..000000000000
--- a/rust/ql/test/extractor-tests/generated/Path/PathType_getPath.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
-| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | gen_path_expr.rs:8:14:8:20 | TypeRef |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | gen_path_expr.rs:8:14:8:20 | TypeRef |
-| gen_path_type.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type.rs:5:14:5:48 | ...::HashMap::<...> |
-| gen_path_type.rs:5:40:5:42 | i32 | gen_path_type.rs:5:40:5:42 | i32 |
-| gen_path_type.rs:5:45:5:47 | i32 | gen_path_type.rs:5:45:5:47 | i32 |
-| gen_path_type.rs:6:14:6:20 | ...::Item | gen_path_type.rs:6:14:6:20 | ...::Item |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected
index 99ed98b3f521..790050bbf51b 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected
@@ -10,17 +10,17 @@
 | gen_path_expr.rs:7:13:7:20 | ...::foo | gen_path_expr.rs:7:18:7:20 | foo |
 | gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
 | gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
-| gen_path_expr.rs:8:13:8:30 | <...> | gen_path_expr.rs:8:13:8:30 | <...> |
-| gen_path_expr.rs:8:13:8:35 | ...::foo | gen_path_expr.rs:8:33:8:35 | foo |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | gen_path_expr.rs:8:14:8:20 | TypeRef |
-| gen_path_expr.rs:8:14:8:20 | TypeRef | gen_path_expr.rs:8:14:8:20 | TypeRef |
+| gen_path_expr.rs:8:13:8:31 | <...> | gen_path_expr.rs:8:13:8:31 | <...> |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | gen_path_expr.rs:8:34:8:36 | foo |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
 | gen_path_pat.rs:5:11:5:11 | x | gen_path_pat.rs:5:11:5:11 | x |
 | gen_path_pat.rs:6:9:6:11 | Foo | gen_path_pat.rs:6:9:6:11 | Foo |
 | gen_path_pat.rs:6:9:6:16 | ...::Bar | gen_path_pat.rs:6:14:6:16 | Bar |
-| gen_path_type.rs:5:14:5:16 | std | gen_path_type.rs:5:14:5:16 | std |
-| gen_path_type.rs:5:14:5:29 | ...::collections | gen_path_type.rs:5:19:5:29 | collections |
-| gen_path_type.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type.rs:5:32:5:48 | HashMap::<...> |
-| gen_path_type.rs:5:40:5:42 | i32 | gen_path_type.rs:5:40:5:42 | i32 |
-| gen_path_type.rs:5:45:5:47 | i32 | gen_path_type.rs:5:45:5:47 | i32 |
-| gen_path_type.rs:6:14:6:14 | X | gen_path_type.rs:6:14:6:14 | X |
-| gen_path_type.rs:6:14:6:20 | ...::Item | gen_path_type.rs:6:17:6:20 | Item |
+| gen_path_type_repr.rs:5:14:5:16 | std | gen_path_type_repr.rs:5:14:5:16 | std |
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | gen_path_type_repr.rs:5:19:5:29 | collections |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | gen_path_type_repr.rs:5:40:5:42 | i32 |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | gen_path_type_repr.rs:5:45:5:47 | i32 |
+| gen_path_type_repr.rs:6:14:6:14 | X | gen_path_type_repr.rs:6:14:6:14 | X |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | gen_path_type_repr.rs:6:17:6:20 | Item |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected
index 162efd4b1870..de116eaca6a8 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected
@@ -3,8 +3,8 @@
 | gen_path.rs:6:5:6:12 | ...::bar | gen_path.rs:6:5:6:7 | foo |
 | gen_path_expr.rs:6:13:6:20 | ...::bar | gen_path_expr.rs:6:13:6:15 | foo |
 | gen_path_expr.rs:7:13:7:20 | ...::foo | gen_path_expr.rs:7:13:7:15 | <...> |
-| gen_path_expr.rs:8:13:8:35 | ...::foo | gen_path_expr.rs:8:13:8:30 | <...> |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | gen_path_expr.rs:8:13:8:31 | <...> |
 | gen_path_pat.rs:6:9:6:16 | ...::Bar | gen_path_pat.rs:6:9:6:11 | Foo |
-| gen_path_type.rs:5:14:5:29 | ...::collections | gen_path_type.rs:5:14:5:16 | std |
-| gen_path_type.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type.rs:5:14:5:29 | ...::collections |
-| gen_path_type.rs:6:14:6:20 | ...::Item | gen_path_type.rs:6:14:6:14 | X |
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | gen_path_type_repr.rs:5:14:5:16 | std |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type_repr.rs:5:14:5:29 | ...::collections |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | gen_path_type_repr.rs:6:14:6:14 | X |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected
index df80e22f7446..3f821b1e0805 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected
@@ -1,2 +1,2 @@
-| gen_path_type.rs:5:14:5:29 | ...::collections | lang:std |
-| gen_path_type.rs:5:14:5:48 | ...::HashMap::<...> | lang:std |
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | lang:std |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | lang:std |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected
index 7d1c698b0ce5..574e8ffb2150 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected
@@ -1,2 +1,2 @@
-| gen_path_type.rs:5:14:5:29 | ...::collections | crate::collections |
-| gen_path_type.rs:5:14:5:48 | ...::HashMap::<...> | crate::collections::hash::map::HashMap |
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | crate::collections |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | crate::collections::hash::map::HashMap |
diff --git a/rust/ql/test/extractor-tests/generated/Path/gen_path_expr.rs b/rust/ql/test/extractor-tests/generated/Path/gen_path_expr.rs
index dfd45ebd73fc..dfc1b74308de 100644
--- a/rust/ql/test/extractor-tests/generated/Path/gen_path_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/Path/gen_path_expr.rs
@@ -5,5 +5,5 @@ fn test_path_expr() -> () {
     let x = variable;
     let x = foo::bar;
     let y = <T>::foo;
-    let z = <TypeRef as Trait>::foo;
+    let z = <TypeRepr as Trait>::foo;
 }
diff --git a/rust/ql/test/extractor-tests/generated/Path/gen_path_type.rs b/rust/ql/test/extractor-tests/generated/Path/gen_path_type_repr.rs
similarity index 82%
rename from rust/ql/test/extractor-tests/generated/Path/gen_path_type.rs
rename to rust/ql/test/extractor-tests/generated/Path/gen_path_type_repr.rs
index 62797d756779..a3dc7ccb6e4a 100644
--- a/rust/ql/test/extractor-tests/generated/Path/gen_path_type.rs
+++ b/rust/ql/test/extractor-tests/generated/Path/gen_path_type_repr.rs
@@ -1,6 +1,6 @@
 // generated by codegen, do not edit
 
-fn test_path_type() -> () {
+fn test_path_type_repr() -> () {
     // A type referring to a path. For example:
     type X = std::collections::HashMap<i32, i32>;
     type Y = X::Item;
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.ql b/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.ql
deleted file mode 100644
index 4b42d47161a3..000000000000
--- a/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from PtrType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/gen_ptr_type.rs b/rust/ql/test/extractor-tests/generated/PtrType/gen_ptr_type.rs
deleted file mode 100644
index 1a7e8960f1d1..000000000000
--- a/rust/ql/test/extractor-tests/generated/PtrType/gen_ptr_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_ptr_type() -> () {
-    // A PtrType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.expected b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PtrType/PtrType.expected
rename to rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql
similarity index 54%
rename from rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql
rename to rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql
index 7dc004522c78..4cbda847f324 100644
--- a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql
+++ b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from PtrType x, string isConst, string isMut, string hasTy
+from PtrTypeRepr x, string isConst, string isMut, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.isMut() then isMut = "yes" else isMut = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "isConst:", isConst, "isMut:", isMut, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "isConst:", isConst, "isMut:", isMut, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.expected b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql
new file mode 100644
index 000000000000..8200677c2b57
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PtrTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/PtrTypeRepr/gen_ptr_type_repr.rs b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/gen_ptr_type_repr.rs
new file mode 100644
index 000000000000..a071dfa0bbf5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/gen_ptr_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_ptr_type_repr() -> () {
+    // A PtrTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
index a54b29b82156..6cb0510df2c1 100644
--- a/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
@@ -2,13 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from RecordField x, int getNumberOfAttrs, string hasName, string hasTy, string hasVisibility
+from RecordField x, int getNumberOfAttrs, string hasName, string hasTypeRepr, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasTy:", hasTy,
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr,
   "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.expected
rename to rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.ql
rename to rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql
index 1abbb150b25e..ff17c17135bf 100644
--- a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from RecordField x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.ql b/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.ql
deleted file mode 100644
index 43df7ca037c1..000000000000
--- a/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RefType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/RefType/gen_ref_type.rs b/rust/ql/test/extractor-tests/generated/RefType/gen_ref_type.rs
deleted file mode 100644
index dacb6fc482d6..000000000000
--- a/rust/ql/test/extractor-tests/generated/RefType/gen_ref_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_ref_type() -> () {
-    // A RefType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType.expected b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType.expected
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType.ql b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql
similarity index 54%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType.ql
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql
index 1a0df7a0b98a..e60d7faa8ed2 100644
--- a/rust/ql/test/extractor-tests/generated/RefType/RefType.ql
+++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from RefType x, string isMut, string hasLifetime, string hasTy
+from RefTypeRepr x, string isMut, string hasLifetime, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.isMut() then isMut = "yes" else isMut = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "isMut:", isMut, "hasLifetime:", hasLifetime, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "isMut:", isMut, "hasLifetime:", hasLifetime, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.expected b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.expected
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.expected
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.ql b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql
similarity index 88%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.ql
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql
index 897c4ef519d7..9d857300ea47 100644
--- a/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.ql
+++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from RefType x
+from RefTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.expected b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql
new file mode 100644
index 000000000000..1e04fa75ab3a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RefTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/RefTypeRepr/gen_ref_type_repr.rs b/rust/ql/test/extractor-tests/generated/RefTypeRepr/gen_ref_type_repr.rs
new file mode 100644
index 000000000000..083e0817fbf4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/gen_ref_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_ref_type_repr() -> () {
+    // A RefTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType.expected b/rust/ql/test/extractor-tests/generated/RetType/RetType.expected
deleted file mode 100644
index 726fcffd1d65..000000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/RetType.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_ret_type.rs:3:20:3:24 | RetType | hasTy: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType.ql b/rust/ql/test/extractor-tests/generated/RetType/RetType.ql
deleted file mode 100644
index c2fd2818d853..000000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/RetType.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RetType x, string hasTy
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.expected b/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.expected
deleted file mode 100644
index e8e62fa58ec5..000000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_ret_type.rs:3:20:3:24 | RetType | gen_ret_type.rs:3:23:3:24 | TupleType |
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.ql b/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.ql
deleted file mode 100644
index 5163cb62b2f4..000000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RetType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/RetType/gen_ret_type.rs b/rust/ql/test/extractor-tests/generated/RetType/gen_ret_type.rs
deleted file mode 100644
index 146766cefe3f..000000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/gen_ret_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_ret_type() -> () {
-    // A RetType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected
new file mode 100644
index 000000000000..fb87db7cabe0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected
@@ -0,0 +1,2 @@
+| gen_ret_type_repr.rs:3:25:3:29 | RetTypeRepr | hasTypeRepr: | yes |
+
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql
new file mode 100644
index 000000000000..d03f9d4f1b6d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RetTypeRepr x, string hasTypeRepr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.expected b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.expected
new file mode 100644
index 000000000000..967da637efbd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.expected
@@ -0,0 +1 @@
+| gen_ret_type_repr.rs:3:25:3:29 | RetTypeRepr | gen_ret_type_repr.rs:3:28:3:29 | TupleTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql
new file mode 100644
index 000000000000..b2a7bf73d763
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RetTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs b/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs
new file mode 100644
index 000000000000..4c3b8a6aaf0c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_ret_type_repr() -> () {
+    // A RetTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected
index 41c5e89e83d0..6fd67c90f3ba 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected
@@ -1 +1 @@
-| gen_self_param.rs:5:13:5:21 | SelfParam | getNumberOfAttrs: | 0 | hasTy: | no | isMut: | yes | hasLifetime: | no | hasName: | yes |
+| gen_self_param.rs:5:13:5:21 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isMut: | yes | hasLifetime: | no | hasName: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
index 579ec7ffa2ad..2e8ef6d0bb61 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
@@ -3,14 +3,15 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  SelfParam x, int getNumberOfAttrs, string hasTy, string isMut, string hasLifetime, string hasName
+  SelfParam x, int getNumberOfAttrs, string hasTypeRepr, string isMut, string hasLifetime,
+  string hasName
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   (if x.isMut() then isMut = "yes" else isMut = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
   if x.hasName() then hasName = "yes" else hasName = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTy:", hasTy, "isMut:", isMut, "hasLifetime:",
-  hasLifetime, "hasName:", hasName
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTypeRepr:", hasTypeRepr, "isMut:", isMut,
+  "hasLifetime:", hasLifetime, "hasName:", hasName
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.expected
rename to rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql
rename to rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql
index 5c04c13cdf2d..0be0ec9902d9 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from SelfParam x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType.ql b/rust/ql/test/extractor-tests/generated/SliceType/SliceType.ql
deleted file mode 100644
index ebd87495b495..000000000000
--- a/rust/ql/test/extractor-tests/generated/SliceType/SliceType.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SliceType x, string hasTy
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.ql b/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.ql
deleted file mode 100644
index ff977cdd8fc1..000000000000
--- a/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SliceType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/gen_slice_type.rs b/rust/ql/test/extractor-tests/generated/SliceType/gen_slice_type.rs
deleted file mode 100644
index 49c11e484ac8..000000000000
--- a/rust/ql/test/extractor-tests/generated/SliceType/gen_slice_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_slice_type() -> () {
-    // A SliceType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType.expected b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/SliceType/SliceType.expected
rename to rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql
new file mode 100644
index 000000000000..4f60ce58624c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SliceTypeRepr x, string hasTypeRepr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.expected b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql
new file mode 100644
index 000000000000..80d2c59ba290
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SliceTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/gen_slice_type_repr.rs b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/gen_slice_type_repr.rs
new file mode 100644
index 000000000000..657b98a3efd2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/gen_slice_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_slice_type_repr() -> () {
+    // A SliceTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql
index 7450b7778a10..3a632dabf47c 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static.ql
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql
@@ -4,7 +4,8 @@ import TestUtils
 
 from
   Static x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
-  string hasBody, string isMut, string isStatic, string hasName, string hasTy, string hasVisibility
+  string hasBody, string isMut, string isStatic, string hasName, string hasTypeRepr,
+  string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -19,8 +20,8 @@ where
   (if x.isMut() then isMut = "yes" else isMut = "no") and
   (if x.isStatic() then isStatic = "yes" else isStatic = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
   "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isMut:", isMut, "isStatic:",
-  isStatic, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility
+  isStatic, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getTy.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/Static/Static_getTy.expected
rename to rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getTy.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/Static/Static_getTy.ql
rename to rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.ql
index b1dc6d79529a..6aa9e4108e92 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from Static x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
index d3f839684974..15401629a602 100644
--- a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
@@ -2,11 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from TupleField x, int getNumberOfAttrs, string hasTy, string hasVisibility
+from TupleField x, int getNumberOfAttrs, string hasTypeRepr, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTy:", hasTy, "hasVisibility:", hasVisibility
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTypeRepr:", hasTypeRepr, "hasVisibility:",
+  hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.expected b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.expected
rename to rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.ql
rename to rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql
index ba0b3bfdbeef..b68e736cec3d 100644
--- a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TupleField x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.expected b/rust/ql/test/extractor-tests/generated/TupleType/TupleType.expected
deleted file mode 100644
index 40f8dde93022..000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_tuple_type.rs:3:25:3:26 | TupleType | getNumberOfFields: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/gen_tuple_type.rs b/rust/ql/test/extractor-tests/generated/TupleType/gen_tuple_type.rs
deleted file mode 100644
index 5e1a26db519a..000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleType/gen_tuple_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_tuple_type() -> () {
-    // A TupleType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected
new file mode 100644
index 000000000000..a35fda175817
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected
@@ -0,0 +1 @@
+| gen_tuple_type_repr.rs:3:30:3:31 | TupleTypeRepr | getNumberOfFields: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.ql b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql
similarity index 83%
rename from rust/ql/test/extractor-tests/generated/TupleType/TupleType.ql
rename to rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql
index 785ae988aa0d..79bf87b93a6c 100644
--- a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from TupleType x, int getNumberOfFields
+from TupleTypeRepr x, int getNumberOfFields
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.expected b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.expected
rename to rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.expected
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.ql b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql
similarity index 83%
rename from rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.ql
rename to rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql
index c77aa1e03b6c..3f11b1aa4152 100644
--- a/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from TupleType x, int index
+from TupleTypeRepr x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleTypeRepr/gen_tuple_type_repr.rs b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/gen_tuple_type_repr.rs
new file mode 100644
index 000000000000..69dbf686aff8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/gen_tuple_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_tuple_type_repr() -> () {
+    // A TupleTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
index 5959301f81a4..16e92ed7e023 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   TypeAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
-  string hasGenericParamList, string isDefault, string hasName, string hasTy,
+  string hasGenericParamList, string isDefault, string hasName, string hasTypeRepr,
   string hasTypeBoundList, string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
@@ -19,11 +19,11 @@ where
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
   (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
   "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isDefault:",
-  isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasTypeBoundList:", hasTypeBoundList,
-  "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
+  isDefault, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, "hasTypeBoundList:",
+  hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.expected
rename to rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql
rename to rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql
index 885047b16e9d..82be0a670ec0 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TypeAlias x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql
index 17a26b5b190e..03464c382182 100644
--- a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql
@@ -2,9 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from TypeArg x, string hasTy
+from TypeArg x, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.expected b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.expected
rename to rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql
rename to rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql
index 55434bfda46c..d1a4956f460f 100644
--- a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TypeArg x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
index 449ca67ed71e..ee0be38236ae 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   TypeBound x, string hasGenericParamList, string isAsync, string isConst, string hasLifetime,
-  string hasTy
+  string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -12,6 +12,6 @@ where
   (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
   (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
 select x, "hasGenericParamList:", hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst,
-  "hasLifetime:", hasLifetime, "hasTy:", hasTy
+  "hasLifetime:", hasLifetime, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.expected
rename to rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql
rename to rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql
index 56c8f92d433f..d8ed0d052568 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TypeBound x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
index 40d5072725d1..a4471e43ef6a 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
@@ -3,13 +3,14 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  WherePred x, string hasGenericParamList, string hasLifetime, string hasTy, string hasTypeBoundList
+  WherePred x, string hasGenericParamList, string hasLifetime, string hasTypeRepr,
+  string hasTypeBoundList
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
-select x, "hasGenericParamList:", hasGenericParamList, "hasLifetime:", hasLifetime, "hasTy:", hasTy,
-  "hasTypeBoundList:", hasTypeBoundList
+select x, "hasGenericParamList:", hasGenericParamList, "hasLifetime:", hasLifetime, "hasTypeRepr:",
+  hasTypeRepr, "hasTypeBoundList:", hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.expected
rename to rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.ql
rename to rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql
index bbb432ddbe7f..e1992ba278ec 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from WherePred x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index 773d126e5d1c..9ee94e99c25e 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -65,7 +65,7 @@ class _:
     """
 
 
-@annotate(TypeRef)
+@annotate(TypeRepr)
 class _:
     """
     The base class for type references.
@@ -129,7 +129,7 @@ class _:
     let x = variable;
     let x = foo::bar;
     let y = <T>::foo;
-    let z = <TypeRef as Trait>::foo;
+    let z = <TypeRepr as Trait>::foo;
     ```
     """
 
@@ -872,10 +872,10 @@ class _:
     """
 
 
-@annotate(ArrayType)
+@annotate(ArrayTypeRepr)
 class _:
     """
-    A ArrayType. For example:
+    A ArrayTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -960,10 +960,10 @@ class _:
     """
 
 
-@annotate(DynTraitType)
+@annotate(DynTraitTypeRepr)
 class _:
     """
-    A DynTraitType. For example:
+    A DynTraitTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1030,10 +1030,10 @@ class _:
     """
 
 
-@annotate(FnPtrType)
+@annotate(FnPtrTypeRepr)
 class _:
     """
-    A FnPtrType. For example:
+    A FnPtrTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1052,10 +1052,10 @@ class _:
     loop_body: drop
 
 
-@annotate(ForType)
+@annotate(ForTypeRepr)
 class _:
     """
-    A ForType. For example:
+    A ForTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1128,20 +1128,20 @@ class _:
     """
 
 
-@annotate(ImplTraitType)
+@annotate(ImplTraitTypeRepr)
 class _:
     """
-    A ImplTraitType. For example:
+    A ImplTraitTypeRepr. For example:
     ```rust
     todo!()
     ```
     """
 
 
-@annotate(InferType)
+@annotate(InferTypeRepr)
 class _:
     """
-    A InferType. For example:
+    A InferTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1285,10 +1285,10 @@ class _:
     """
 
 
-@annotate(MacroType)
+@annotate(MacroTypeRepr)
 class _:
     """
-    A MacroType. For example:
+    A MacroTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1345,10 +1345,10 @@ class _:
     """
 
 
-@annotate(NeverType)
+@annotate(NeverTypeRepr)
 class _:
     """
-    A NeverType. For example:
+    A NeverTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1360,7 +1360,7 @@ class ParamBase(AstNode):
     A normal parameter, `Param`, or a self parameter `SelfParam`.
     """
     attrs: list["Attr"] | child
-    ty: optional["TypeRef"] | child
+    type_repr: optional["TypeRepr"] | child
 
 @annotate(ParamBase, cfg = True)
 class _:
@@ -1377,7 +1377,7 @@ class _:
     ```
     """
     attrs: drop
-    ty: drop
+    type_repr: drop
 
 
 @annotate(ParamList)
@@ -1410,10 +1410,10 @@ class _:
     """
 
 
-@annotate(ParenType)
+@annotate(ParenTypeRepr)
 class _:
     """
-    A ParenType. For example:
+    A ParenTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1428,7 +1428,7 @@ class _:
     """
 
 
-@annotate(PathType)
+@annotate(PathTypeRepr)
 @qltest.test_with(Path)
 class _:
     """
@@ -1440,10 +1440,10 @@ class _:
     """
 
 
-@annotate(PtrType)
+@annotate(PtrTypeRepr)
 class _:
     """
-    A PtrType. For example:
+    A PtrTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1490,10 +1490,10 @@ class _:
     """
 
 
-@annotate(RefType)
+@annotate(RefTypeRepr)
 class _:
     """
-    A RefType. For example:
+    A RefTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1520,10 +1520,10 @@ class _:
     """
 
 
-@annotate(RetType)
+@annotate(RetTypeRepr)
 class _:
     """
-    A RetType. For example:
+    A RetTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1551,13 +1551,13 @@ class _:
     ```
     """
     attrs: drop
-    ty: drop
+    type_repr: drop
 
 
-@annotate(SliceType)
+@annotate(SliceTypeRepr)
 class _:
     """
-    A SliceType. For example:
+    A SliceTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1671,10 +1671,10 @@ class _:
     """
 
 
-@annotate(TupleType)
+@annotate(TupleTypeRepr)
 class _:
     """
-    A TupleType. For example:
+    A TupleTypeRepr. For example:
     ```rust
     todo!()
     ```
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index bd5cd0b8f928..77d52977b4ec 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -26,7 +26,7 @@ class Pat(AstNode):
 class Stmt(AstNode):
    pass
 
-class TypeRef(AstNode):
+class TypeRepr(AstNode):
    pass
 
 class Item(Stmt):
@@ -43,9 +43,9 @@ class ArrayExprInternal(Expr):
    exprs: list["Expr"] | child
    is_semicolon: predicate
 
-class ArrayType(TypeRef):
+class ArrayTypeRepr(TypeRepr):
    const_arg: optional["ConstArg"] | child
-   ty: optional["TypeRef"] | child
+   element_type_repr: optional["TypeRepr"] | child
 
 class AsmExpr(Expr):
    attrs: list["Attr"] | child
@@ -60,9 +60,9 @@ class AssocTypeArg(GenericArg):
    generic_arg_list: optional["GenericArgList"] | child
    name_ref: optional["NameRef"] | child
    param_list: optional["ParamList"] | child
-   ret_type: optional["RetType"] | child
+   ret_type: optional["RetTypeRepr"] | child
    return_type_syntax: optional["ReturnTypeSyntax"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    type_bound_list: optional["TypeBoundList"] | child
 
 class Attr(AstNode):
@@ -109,7 +109,7 @@ class CallExpr(Expr):
 class CastExpr(Expr):
    attrs: list["Attr"] | child
    expr: optional["Expr"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class ClosureBinder(AstNode):
    generic_param_list: optional["GenericParamList"] | child
@@ -124,7 +124,7 @@ class ClosureExpr(Expr):
    is_move: predicate
    is_static: predicate
    param_list: optional["ParamList"] | child
-   ret_type: optional["RetType"] | child
+   ret_type: optional["RetTypeRepr"] | child
 
 class Const(AssocItem,Item):
    attrs: list["Attr"] | child
@@ -132,7 +132,7 @@ class Const(AssocItem,Item):
    is_const: predicate
    is_default: predicate
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
 
 class ConstArg(GenericArg):
@@ -147,13 +147,13 @@ class ConstParam(GenericParam):
    default_val: optional["ConstArg"] | child
    is_const: predicate
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class ContinueExpr(Expr):
    attrs: list["Attr"] | child
    lifetime: optional["Lifetime"] | child
 
-class DynTraitType(TypeRef):
+class DynTraitTypeRepr(TypeRepr):
    type_bound_list: optional["TypeBoundList"] | child
 
 class Enum(Item):
@@ -200,17 +200,17 @@ class Function(AssocItem,ExternItem,Item):
    is_unsafe: predicate
    name: optional["Name"] | child
    param_list: optional["ParamList"] | child
-   ret_type: optional["RetType"] | child
+   ret_type: optional["RetTypeRepr"] | child
    visibility: optional["Visibility"] | child
    where_clause: optional["WhereClause"] | child
 
-class FnPtrType(TypeRef):
+class FnPtrTypeRepr(TypeRepr):
    abi: optional["Abi"] | child
    is_async: predicate
    is_const: predicate
    is_unsafe: predicate
    param_list: optional["ParamList"] | child
-   ret_type: optional["RetType"] | child
+   ret_type: optional["RetTypeRepr"] | child
 
 class ForExpr(Expr):
    attrs: list["Attr"] | child
@@ -219,9 +219,9 @@ class ForExpr(Expr):
    loop_body: optional["BlockExpr"] | child
    pat: optional["Pat"] | child
 
-class ForType(TypeRef):
+class ForTypeRepr(TypeRepr):
    generic_param_list: optional["GenericParamList"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class FormatArgsArg(AstNode):
    expr: optional["Expr"] | child
@@ -258,12 +258,12 @@ class Impl(Item):
    is_const: predicate
    is_default: predicate
    is_unsafe: predicate
-   self_ty: optional["TypeRef"] | child
-   trait_: optional["TypeRef"] | child
+   self_ty: optional["TypeRepr"] | child
+   trait_: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
    where_clause: optional["WhereClause"] | child
 
-class ImplTraitType(TypeRef):
+class ImplTraitTypeRepr(TypeRepr):
    type_bound_list: optional["TypeBoundList"] | child
 
 class IndexExpr(Expr):
@@ -271,7 +271,7 @@ class IndexExpr(Expr):
    base: optional["Expr"] | child
    index: optional["Expr"] | child
 
-class InferType(TypeRef):
+class InferTypeRepr(TypeRepr):
    pass
 
 class ItemList(AstNode):
@@ -294,7 +294,7 @@ class LetStmt(Stmt):
    initializer: optional["Expr"] | child
    let_else: optional["LetElse"] | child
    pat: optional["Pat"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class Lifetime(AstNode):
    text: optional[string]
@@ -350,7 +350,7 @@ class MacroStmts(AstNode):
    expr: optional["Expr"] | child
    statements: list["Stmt"] | child
 
-class MacroType(TypeRef):
+class MacroTypeRepr(TypeRepr):
    macro_call: optional["MacroCall"] | child
 
 class MatchArm(AstNode):
@@ -396,13 +396,13 @@ class Name(AstNode):
 class NameRef(AstNode):
    text: optional[string]
 
-class NeverType(TypeRef):
+class NeverTypeRepr(TypeRepr):
    pass
 
 class OffsetOfExpr(Expr):
    attrs: list["Attr"] | child
    fields: list["NameRef"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class OrPat(Pat):
    pats: list["Pat"] | child
@@ -410,7 +410,7 @@ class OrPat(Pat):
 class Param(AstNode):
    attrs: list["Attr"] | child
    pat: optional["Pat"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class ParamList(AstNode):
    params: list["Param"] | child
@@ -423,8 +423,8 @@ class ParenExpr(Expr):
 class ParenPat(Pat):
    pat: optional["Pat"] | child
 
-class ParenType(TypeRef):
-   ty: optional["TypeRef"] | child
+class ParenTypeRepr(TypeRepr):
+   type_repr: optional["TypeRepr"] | child
 
 class Path(AstNode):
    qualifier: optional["Path"] | child
@@ -441,12 +441,12 @@ class PathSegment(AstNode):
    generic_arg_list: optional["GenericArgList"] | child
    name_ref: optional["NameRef"] | child
    param_list: optional["ParamList"] | child
-   path_type: optional["PathType"] | child
-   ret_type: optional["RetType"] | child
+   path_type: optional["PathTypeRepr"] | child
+   ret_type: optional["RetTypeRepr"] | child
    return_type_syntax: optional["ReturnTypeSyntax"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
-class PathType(TypeRef):
+class PathTypeRepr(TypeRepr):
    path: optional["Path"] | child
 
 class PrefixExpr(Expr):
@@ -454,10 +454,10 @@ class PrefixExpr(Expr):
    expr: optional["Expr"] | child
    operator_name: optional[string]
 
-class PtrType(TypeRef):
+class PtrTypeRepr(TypeRepr):
    is_const: predicate
    is_mut: predicate
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class RangeExpr(Expr):
    attrs: list["Attr"] | child
@@ -487,7 +487,7 @@ class RecordExprFieldList(AstNode):
 class RecordField(AstNode):
    attrs: list["Attr"] | child
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
 
 class RecordFieldList(FieldList):
@@ -517,10 +517,10 @@ class RefPat(Pat):
    is_mut: predicate
    pat: optional["Pat"] | child
 
-class RefType(TypeRef):
+class RefTypeRepr(TypeRepr):
    is_mut: predicate
    lifetime: optional["Lifetime"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class Rename(AstNode):
    name: optional["Name"] | child
@@ -528,8 +528,8 @@ class Rename(AstNode):
 class RestPat(Pat):
    attrs: list["Attr"] | child
 
-class RetType(AstNode):
-   ty: optional["TypeRef"] | child
+class RetTypeRepr(AstNode):
+   type_repr: optional["TypeRepr"] | child
 
 class ReturnExpr(Expr):
    attrs: list["Attr"] | child
@@ -543,13 +543,13 @@ class SelfParam(AstNode):
    is_mut: predicate
    lifetime: optional["Lifetime"] | child
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class SlicePat(Pat):
    pats: list["Pat"] | child
 
-class SliceType(TypeRef):
-   ty: optional["TypeRef"] | child
+class SliceTypeRepr(TypeRepr):
+   type_repr: optional["TypeRepr"] | child
 
 class SourceFile(AstNode):
    attrs: list["Attr"] | child
@@ -561,7 +561,7 @@ class Static(ExternItem,Item):
    is_mut: predicate
    is_static: predicate
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
 
 class StmtList(AstNode):
@@ -609,7 +609,7 @@ class TupleExpr(Expr):
 
 class TupleField(AstNode):
    attrs: list["Attr"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
 
 class TupleFieldList(FieldList):
@@ -622,35 +622,35 @@ class TupleStructPat(Pat):
    fields: list["Pat"] | child
    path: optional["Path"] | child
 
-class TupleType(TypeRef):
-   fields: list["TypeRef"] | child
+class TupleTypeRepr(TypeRepr):
+   fields: list["TypeRepr"] | child
 
 class TypeAlias(AssocItem,ExternItem,Item):
    attrs: list["Attr"] | child
    generic_param_list: optional["GenericParamList"] | child
    is_default: predicate
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    type_bound_list: optional["TypeBoundList"] | child
    visibility: optional["Visibility"] | child
    where_clause: optional["WhereClause"] | child
 
 class TypeArg(GenericArg):
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class TypeBound(AstNode):
    generic_param_list: optional["GenericParamList"] | child
    is_async: predicate
    is_const: predicate
    lifetime: optional["Lifetime"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class TypeBoundList(AstNode):
    bounds: list["TypeBound"] | child
 
 class TypeParam(GenericParam):
    attrs: list["Attr"] | child
-   default_type: optional["TypeRef"] | child
+   default_type: optional["TypeRepr"] | child
    name: optional["Name"] | child
    type_bound_list: optional["TypeBoundList"] | child
 
@@ -697,7 +697,7 @@ class WhereClause(AstNode):
 class WherePred(AstNode):
    generic_param_list: optional["GenericParamList"] | child
    lifetime: optional["Lifetime"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    type_bound_list: optional["TypeBoundList"] | child
 
 class WhileExpr(Expr):