From 698ca0d3ffe2722ebf1117d84a80fe65dd211c2f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Tue, 12 Dec 2023 15:55:04 +0100 Subject: [PATCH] [java] Rename ASTClassOrInterfaceType to ASTClassType --- docs/pages/pmd/userdocs/migrating_to_pmd7.md | 1 + docs/pages/release_notes.md | 2 + pmd-java/etc/grammar/Java.jjt | 8 +- .../pmd/lang/java/ast/ASTAmbiguousName.java | 6 +- .../pmd/lang/java/ast/ASTAnnotation.java | 6 +- .../ast/ASTAnonymousClassDeclaration.java | 2 +- .../lang/java/ast/ASTAnyTypeDeclaration.java | 2 +- .../pmd/lang/java/ast/ASTArrayType.java | 2 +- .../pmd/lang/java/ast/ASTCatchParameter.java | 6 +- .../ast/ASTClassOrInterfaceDeclaration.java | 4 +- ...OrInterfaceType.java => ASTClassType.java} | 26 +- .../pmd/lang/java/ast/ASTConstructorCall.java | 6 +- .../pmd/lang/java/ast/ASTExtendsList.java | 6 +- .../pmd/lang/java/ast/ASTImplementsList.java | 6 +- .../lang/java/ast/ASTIntersectionType.java | 6 +- .../java/ast/ASTModuleProvidesDirective.java | 12 +- .../lang/java/ast/ASTModuleUsesDirective.java | 4 +- .../pmd/lang/java/ast/ASTPermitsList.java | 8 +- .../lang/java/ast/ASTReceiverParameter.java | 6 +- .../pmd/lang/java/ast/ASTReferenceType.java | 4 +- .../pmd/lang/java/ast/ASTSuperExpression.java | 6 +- .../pmd/lang/java/ast/ASTThisExpression.java | 6 +- .../pmd/lang/java/ast/ASTThrowsList.java | 6 +- .../pmd/lang/java/ast/ASTType.java | 2 +- .../pmd/lang/java/ast/ASTUnionType.java | 14 +- .../lang/java/ast/AstDisambiguationPass.java | 24 +- .../pmd/lang/java/ast/InternalApiBridge.java | 2 +- .../pmd/lang/java/ast/JavaVisitorBase.java | 2 +- .../pmd/lang/java/ast/TypesFromAst.java | 14 +- .../lang/java/ast/internal/JavaAstUtils.java | 8 +- .../java/ast/internal/PrettyPrintingUtil.java | 6 +- .../java/internal/JavaDesignerBindings.java | 4 +- .../metrics/internal/ClassFanOutVisitor.java | 4 +- .../rule/bestpractices/LooseCouplingRule.java | 16 +- .../PrimitiveWrapperInstantiationRule.java | 4 +- .../UnnecessaryFullyQualifiedNameRule.java | 24 +- .../rule/codestyle/UnnecessaryImportRule.java | 4 +- .../codestyle/UseDiamondOperatorRule.java | 8 +- .../UnsynchronizedStaticFormatterRule.java | 4 +- .../internal/BaseContextNodeTestFun.java | 2 +- .../symbols/internal/ast/AstClassSym.java | 4 +- .../lang/java/symbols/table/JSymbolTable.java | 4 +- .../table/internal/SymbolTableResolver.java | 4 +- .../resources/category/java/bestpractices.xml | 16 +- .../resources/category/java/codestyle.xml | 6 +- .../main/resources/category/java/design.xml | 10 +- .../resources/category/java/errorprone.xml | 26 +- .../category/java/multithreading.xml | 6 +- .../resources/category/java/performance.xml | 4 +- .../java/ast/ASTVariableDeclaratorIdTest.java | 4 +- .../pmd/lang/java/ast/Java10Test.java | 2 +- .../pmd/lang/java/rule/XPathRuleTest.java | 6 +- .../lang/java/ast/ASTMethodReferenceTest.kt | 2 +- .../pmd/lang/java/ast/TestExtensions.kt | 10 +- .../lang/java/ast/TypeDisambiguationTest.kt | 21 +- .../table/internal/LocalTypeScopesTest.kt | 5 +- .../table/internal/MemberInheritanceTest.kt | 2 +- .../table/internal/TypeParamScopingTest.kt | 10 +- .../pmd/lang/java/types/SubstTest.kt | 4 +- .../infer/UnresolvedTypesRecoveryTest.kt | 8 +- .../sourceforge/pmd/lang/java/ast/Bug1429.txt | 32 +- .../sourceforge/pmd/lang/java/ast/Bug1530.txt | 2 +- .../pmd/lang/java/ast/GitHubBug207.txt | 8 +- .../pmd/lang/java/ast/GitHubBug208.txt | 8 +- .../pmd/lang/java/ast/GitHubBug309.txt | 12 +- .../pmd/lang/java/ast/GitHubBug3642.txt | 2 +- .../pmd/lang/java/ast/LambdaBug1333.txt | 10 +- .../pmd/lang/java/ast/LambdaBug1470.txt | 16 +- .../pmd/lang/java/ast/LambdaBug206.txt | 8 +- .../pmd/lang/java/ast/ParserCornerCases.txt | 122 ++-- .../pmd/lang/java/ast/ParserCornerCases17.txt | 96 ++-- .../pmd/lang/java/ast/ParserCornerCases18.txt | 294 +++++----- .../pmd/lang/java/ast/SwitchStatements.txt | 2 +- .../java14/MultipleCaseLabels.txt | 10 +- .../java14/SimpleSwitchExpressions.txt | 4 +- .../java14/SwitchExpressions.txt | 34 +- .../jdkversiontests/java14/SwitchRules.txt | 12 +- .../java15/NonSealedIdentifier.txt | 4 +- .../ast/jdkversiontests/java15/TextBlocks.txt | 56 +- .../jdkversiontests/java16/LocalRecords.txt | 34 +- .../java16/NonSealedIdentifier.txt | 4 +- .../java16/PatternMatchingInstanceof.txt | 64 +-- .../java/ast/jdkversiontests/java16/Point.txt | 8 +- .../ast/jdkversiontests/java16/Records.txt | 58 +- .../ast/jdkversiontests/java17/LocalVars.txt | 2 +- .../java17/SealedInnerClasses.txt | 12 +- .../java17/expression/Expr.txt | 8 +- .../jdkversiontests/java17/geometry/Shape.txt | 6 +- .../java17/geometry/Square.txt | 2 +- .../java20p/DealingWithNull.txt | 68 +-- .../java20p/EnhancedTypeCheckingSwitch.txt | 30 +- .../java20p/ExhaustiveSwitch.txt | 104 ++-- .../GuardedAndParenthesizedPatterns.txt | 82 +-- .../java20p/PatternsInSwitchLabels.txt | 24 +- .../java20p/RecordPatterns.txt | 166 +++--- .../RecordPatternsExhaustiveSwitch.txt | 102 ++-- .../java20p/RecordPatternsInEnhancedFor.txt | 54 +- .../java20p/RefiningPatternsInSwitch.txt | 46 +- .../ScopeOfPatternVariableDeclarations.txt | 36 +- .../java21/AnnotationValueInitializers.txt | 4 +- .../java21/DealingWithNull.txt | 68 +-- .../java21/EnhancedTypeCheckingSwitch.txt | 30 +- .../java21/ExhaustiveSwitch.txt | 104 ++-- .../java21/GuardedPatterns.txt | 66 +-- .../java21/Jep440_RecordPatterns.txt | 116 ++-- .../Jep441_PatternMatchingForSwitch.txt | 140 ++--- .../java21/PatternsInSwitchLabels.txt | 24 +- .../jdkversiontests/java21/RecordPatterns.txt | 166 +++--- .../java21/RecordPatternsExhaustiveSwitch.txt | 102 ++-- .../java21/RefiningPatternsInSwitch.txt | 46 +- .../ScopeOfPatternVariableDeclarations.txt | 36 +- .../java21p/Jep430_StringTemplates.txt | 96 ++-- .../Jep443_UnnamedPatternsAndVariables.txt | 144 ++--- .../java21p/Jep445_UnnamedClasses1.txt | 2 +- .../java21p/Jep445_UnnamedClasses2.txt | 4 +- .../java21p/Jep445_UnnamedClasses3.txt | 4 +- .../java9/jdk9_module_info.txt | 12 +- .../java9/jdk9_module_info_with_annot.txt | 2 +- .../pmd/lang/java/types/IteratorUtilCopy.txt | 520 +++++++++--------- 119 files changed, 1881 insertions(+), 1884 deletions(-) rename pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/{ASTClassOrInterfaceType.java => ASTClassType.java} (86%) diff --git a/docs/pages/pmd/userdocs/migrating_to_pmd7.md b/docs/pages/pmd/userdocs/migrating_to_pmd7.md index a06dd95c3b..87ec93341a 100644 --- a/docs/pages/pmd/userdocs/migrating_to_pmd7.md +++ b/docs/pages/pmd/userdocs/migrating_to_pmd7.md @@ -393,6 +393,7 @@ which can also display the AST. #### Renamed classes / interfaces * AccessNode ➡️ {% jdoc jast::ModifierOwner %} +* ClassOrInterfaceType ➡️ ClassType ({% jdoc jast::ASTClassType %}) #### Annotations diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index d584463317..6147552252 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -166,6 +166,8 @@ The following previously deprecated classes have been removed: * pmd-java * The interface `AccessNode` has been renamed to {% jdoc java::lang.ast.ModifierOwner %}. This is only relevant for Java rules, which use that type directly e.g. through downcasting. + * The node `ASTClassOrInterfaceType` has been renamed to {% jdoc java::lang.ast.ASTClassType %}. XPath rules + need to be adjusted. **Deprecated classes and methods** diff --git a/pmd-java/etc/grammar/Java.jjt b/pmd-java/etc/grammar/Java.jjt index 60e9dc3902..285ba53885 100644 --- a/pmd-java/etc/grammar/Java.jjt +++ b/pmd-java/etc/grammar/Java.jjt @@ -1684,7 +1684,7 @@ void ClassOrInterfaceType() #void: // a type name, otherwise it wouldn't have compiled. So it's not ambiguous and we can // start fresh: "@B Map.Entry" will be unambiguously [[@B Map].Entry] - ( {setLastTokenImage(jjtThis);} [ TypeArguments() ]) #ClassOrInterfaceType + ( {setLastTokenImage(jjtThis);} [ TypeArguments() ]) #ClassType | @@ -1694,13 +1694,13 @@ void ClassOrInterfaceType() #void: // be sure that the last segment is a type name. AmbiguousName() - [ TypeArguments() #ClassOrInterfaceType(2) ] + [ TypeArguments() #ClassType(2) ] { // At this point the first ClassOrInterfaceType may be on top of the stack, // but its image is not set. If it is on the stack we need to shrink the bounds // of the ambiguous name, or delete it. Node first = jjtree.peekNode(); - if (first instanceof ASTClassOrInterfaceType) { + if (first instanceof ASTClassType) { // then we saw type arguments, so the last segment is definitely a type name ASTAmbiguousName name = first.getFirstChildOfType(ASTAmbiguousName.class); name.shrinkOrDeleteInParentSetImage(); @@ -1720,7 +1720,7 @@ void ClassOrInterfaceType() #void: { forceTypeContext(); } } -private void ClassTypeSegment() #ClassOrInterfaceType(jjtree.nodeArity() + 1): +private void ClassTypeSegment() #ClassType(jjtree.nodeArity() + 1): {} { TypeAnnotListNoInject() diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAmbiguousName.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAmbiguousName.java index 12a0ec23e4..e5c93badf9 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAmbiguousName.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAmbiguousName.java @@ -117,14 +117,14 @@ public final class ASTAmbiguousName extends AbstractJavaExpr implements ASTRefer /** * Called by the parser if this ambiguous name was expected to be - * a type name. Then we simply promote it to an {@link ASTClassOrInterfaceType} + * a type name. Then we simply promote it to an {@link ASTClassType} * with the appropriate LHS. * * @return the node which will replace this node in the tree */ - ASTClassOrInterfaceType forceTypeContext() { + ASTClassType forceTypeContext() { // same, there's no parent here - return shrinkOneSegment(ASTClassOrInterfaceType::new, ASTClassOrInterfaceType::new); + return shrinkOneSegment(ASTClassType::new, ASTClassType::new); } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotation.java index d3cf09097d..9847055317 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotation.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotation.java @@ -18,7 +18,7 @@ import net.sourceforge.pmd.lang.java.types.JClassType; * * 
  *
- * Annotation ::= "@" {@link ASTClassOrInterfaceType ClassName} {@link ASTAnnotationMemberList AnnotationMemberList}?
+ * Annotation ::= "@" {@link ASTClassType ClassName} {@link ASTAnnotationMemberList AnnotationMemberList}?
  *
  *
*/ @@ -32,8 +32,8 @@ public final class ASTAnnotation extends AbstractJavaTypeNode implements TypeNod /** * Returns the node that represents the name of the annotation. */ - public ASTClassOrInterfaceType getTypeNode() { - return (ASTClassOrInterfaceType) getChild(0); + public ASTClassType getTypeNode() { + return (ASTClassType) getChild(0); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnonymousClassDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnonymousClassDeclaration.java index 4834af36a1..8c40366600 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnonymousClassDeclaration.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnonymousClassDeclaration.java @@ -42,7 +42,7 @@ public final class ASTAnonymousClassDeclaration extends AbstractAnyTypeDeclarati } @Override - public @NonNull NodeStream getSuperInterfaceTypeNodes() { + public @NonNull NodeStream getSuperInterfaceTypeNodes() { if (getParent() instanceof ASTConstructorCall) { ASTConstructorCall ctor = (ASTConstructorCall) getParent(); @NonNull JTypeMirror type = ctor.getTypeMirror(); diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnyTypeDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnyTypeDeclaration.java index c54b0777db..762dfd00bd 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnyTypeDeclaration.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnyTypeDeclaration.java @@ -288,7 +288,7 @@ public interface ASTAnyTypeDeclaration * Returns the list of interfaces implemented by this class, or * extended by this interface. Returns null if no such list is declared. */ - default @NonNull NodeStream getSuperInterfaceTypeNodes() { + default @NonNull NodeStream getSuperInterfaceTypeNodes() { return ASTList.orEmptyStream(isInterface() ? firstChild(ASTExtendsList.class) : firstChild(ASTImplementsList.class)); } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayType.java index a107eb3414..8b82deb618 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayType.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayType.java @@ -12,7 +12,7 @@ import net.sourceforge.pmd.lang.ast.NodeStream; * 
  *
  * ArrayType ::= {@link ASTPrimitiveType PrimitiveType} {@link ASTArrayDimensions ArrayDimensions}
- *             | {@link ASTClassOrInterfaceType ClassOrInterfaceType} {@link ASTArrayDimensions ArrayDimensions}
+ *             | {@link ASTClassType ClassOrInterfaceType} {@link ASTArrayDimensions ArrayDimensions}
  *
  *
*/ diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCatchParameter.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCatchParameter.java index 802ae65012..52419bb510 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCatchParameter.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCatchParameter.java @@ -79,12 +79,12 @@ public final class ASTCatchParameter extends AbstractJavaNode * Since exception types cannot be interfaces, the LUB always erases * to a single class supertype (eg {@link RuntimeException}). */ - public NodeStream getAllExceptionTypes() { + public NodeStream getAllExceptionTypes() { ASTType typeNode = getTypeNode(); if (typeNode instanceof ASTUnionType) { - return typeNode.children(ASTClassOrInterfaceType.class); + return typeNode.children(ASTClassType.class); } else { - return NodeStream.of((ASTClassOrInterfaceType) typeNode); + return NodeStream.of((ASTClassType) typeNode); } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java index 4c20a11232..9f07753239 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java @@ -75,7 +75,7 @@ public final class ASTClassOrInterfaceDeclaration extends AbstractAnyTypeDeclara * *

Returns {@code null} otherwise. */ - public ASTClassOrInterfaceType getSuperClassTypeNode() { + public ASTClassType getSuperClassTypeNode() { if (isInterface()) { return null; } @@ -85,7 +85,7 @@ public final class ASTClassOrInterfaceDeclaration extends AbstractAnyTypeDeclara } - public List getPermittedSubclasses() { + public List getPermittedSubclasses() { return ASTList.orEmpty(children(ASTPermitsList.class).first()); } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassType.java similarity index 86% rename from pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassType.java index 3c780af67d..b8a3d737bd 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassType.java @@ -26,12 +26,14 @@ import net.sourceforge.pmd.util.AssertionUtil; * * * + *

Note: This node was called ASTClassOrInterfaceType in PMD 6. + * * @implNote * The parser may produce an AmbiguousName for the qualifier. * This is systematically removed by the disambiguation phase. */ // @formatter:on -public final class ASTClassOrInterfaceType extends AbstractJavaTypeNode implements ASTReferenceType { +public final class ASTClassType extends AbstractJavaTypeNode implements ASTReferenceType { // todo rename to ASTClassType private JTypeDeclSymbol symbol; @@ -43,8 +45,8 @@ public final class ASTClassOrInterfaceType extends AbstractJavaTypeNode implemen private boolean isFqcn; private JClassType implicitEnclosing; - ASTClassOrInterfaceType(ASTAmbiguousName lhs, String simpleName) { - super(JavaParserImplTreeConstants.JJTCLASSORINTERFACETYPE); + ASTClassType(ASTAmbiguousName lhs, String simpleName) { + super(JavaParserImplTreeConstants.JJTCLASSTYPE); assert lhs != null : "Null LHS"; this.addChild(lhs, 0); @@ -53,8 +55,8 @@ public final class ASTClassOrInterfaceType extends AbstractJavaTypeNode implemen } - ASTClassOrInterfaceType(ASTAmbiguousName simpleName) { - super(JavaParserImplTreeConstants.JJTCLASSORINTERFACETYPE); + ASTClassType(ASTAmbiguousName simpleName) { + super(JavaParserImplTreeConstants.JJTCLASSTYPE); this.simpleName = simpleName.getFirstToken().getImage(); assertSimpleNameOk(); @@ -62,13 +64,13 @@ public final class ASTClassOrInterfaceType extends AbstractJavaTypeNode implemen // Just for one usage in Symbol table @Deprecated - public ASTClassOrInterfaceType(String simpleName) { - super(JavaParserImplTreeConstants.JJTCLASSORINTERFACETYPE); + public ASTClassType(String simpleName) { + super(JavaParserImplTreeConstants.JJTCLASSTYPE); this.simpleName = simpleName; } - ASTClassOrInterfaceType(@Nullable ASTClassOrInterfaceType lhs, boolean isFqcn, JavaccToken firstToken, JavaccToken identifier) { - super(JavaParserImplTreeConstants.JJTCLASSORINTERFACETYPE); + ASTClassType(@Nullable ASTClassType lhs, boolean isFqcn, JavaccToken firstToken, JavaccToken identifier) { + super(JavaParserImplTreeConstants.JJTCLASSTYPE); this.setImage(identifier.getImage()); this.isFqcn = isFqcn; if (lhs != null) { @@ -79,7 +81,7 @@ public final class ASTClassOrInterfaceType extends AbstractJavaTypeNode implemen } - ASTClassOrInterfaceType(int id) { + ASTClassType(int id) { super(id); } @@ -141,8 +143,8 @@ public final class ASTClassOrInterfaceType extends AbstractJavaTypeNode implemen * @return A type, or null if this is a base type */ @Nullable - public ASTClassOrInterfaceType getQualifier() { - return getFirstChildOfType(ASTClassOrInterfaceType.class); + public ASTClassType getQualifier() { + return getFirstChildOfType(ASTClassType.class); } /** diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConstructorCall.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConstructorCall.java index cc7e244ae4..8474d7a48a 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConstructorCall.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConstructorCall.java @@ -18,7 +18,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; * | {@link ASTExpression Expression} "." UnqualifiedAlloc * * UnqualifiedAlloc ::= - * "new" {@link ASTTypeArguments TypeArguments}? {@link ASTClassOrInterfaceType ClassOrInterfaceType} {@link ASTArgumentList ArgumentList} {@link ASTAnonymousClassDeclaration AnonymousClassDeclaration}? + * "new" {@link ASTTypeArguments TypeArguments}? {@link ASTClassType ClassType} {@link ASTArgumentList ArgumentList} {@link ASTAnonymousClassDeclaration AnonymousClassDeclaration}? * * */ @@ -86,8 +86,8 @@ public final class ASTConstructorCall extends AbstractInvocationExpr /** * Returns the type node. */ - public ASTClassOrInterfaceType getTypeNode() { - return getFirstChildOfType(ASTClassOrInterfaceType.class); + public ASTClassType getTypeNode() { + return getFirstChildOfType(ASTClassType.class); } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExtendsList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExtendsList.java index 3375c124e8..607cf81d6f 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExtendsList.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExtendsList.java @@ -14,13 +14,13 @@ import net.sourceforge.pmd.lang.java.ast.ASTList.ASTNonEmptyList; * * 

  *
- * ExtendsList ::= "extends" {@link ASTType Type} ( "," {@link ASTType Type} )*
+ * ExtendsList ::= "extends" {@link ASTClassType ClassType} ( "," {@link ASTClassType ClassType} )*
  *
*/ -public final class ASTExtendsList extends ASTNonEmptyList { +public final class ASTExtendsList extends ASTNonEmptyList { ASTExtendsList(int id) { - super(id, ASTClassOrInterfaceType.class); + super(id, ASTClassType.class); } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java index e7b1c0cf08..61b7dc22ac 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java @@ -12,14 +12,14 @@ import net.sourceforge.pmd.lang.java.ast.ASTList.ASTNonEmptyList; * * 
  *
- * ImplementsList ::= "implements" {@link ASTClassOrInterfaceType ClassOrInterfaceType} ( "," {@link ASTClassOrInterfaceType ClassOrInterfaceType})*
+ * ImplementsList ::= "implements" {@link ASTClassType InterfaceType} ( "," {@link ASTClassType InterfaceType})*
  *
  *
*/ -public final class ASTImplementsList extends ASTNonEmptyList { +public final class ASTImplementsList extends ASTNonEmptyList { ASTImplementsList(int id) { - super(id, ASTClassOrInterfaceType.class); + super(id, ASTClassType.class); } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTIntersectionType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTIntersectionType.java index 80134c4c17..139b3ce32b 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTIntersectionType.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTIntersectionType.java @@ -22,7 +22,7 @@ import net.sourceforge.pmd.lang.ast.NodeStream; * * 
  *
- * IntersectionType ::= {@link ASTClassOrInterfaceType ClassOrInterfaceType} ("&" {@link ASTClassOrInterfaceType InterfaceType})+
+ * IntersectionType ::= {@link ASTClassType ClassOrInterfaceType} ("&" {@link ASTClassType InterfaceType})+
  *
  *
*/ @@ -36,8 +36,8 @@ public final class ASTIntersectionType extends AbstractJavaTypeNode } /** Returns a stream of component types. */ - public NodeStream getComponents() { - return children(ASTClassOrInterfaceType.class); + public NodeStream getComponents() { + return children(ASTClassType.class); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java index 5e58bb0e7c..9c897e8246 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java @@ -12,8 +12,8 @@ import net.sourceforge.pmd.lang.ast.NodeStream; * 
  *
  * ModuleProvidesDirective ::=
- *     "provides" {@linkplain ASTClassOrInterfaceType ClassType}
- *     "with" {@linkplain ASTClassOrInterfaceType ClassType} ( "," {@linkplain ASTClassOrInterfaceType ClassType} )*
+ *     "provides" {@linkplain ASTClassType ClassType}
+ *     "with" {@linkplain ASTClassType ClassType} ( "," {@linkplain ASTClassType ClassType} )*
  *     ";"
  *
  *
@@ -32,15 +32,15 @@ public final class ASTModuleProvidesDirective extends ASTModuleDirective { /** * Returns the node representing the provided interface. */ - public ASTClassOrInterfaceType getService() { - return firstChild(ASTClassOrInterfaceType.class); + public ASTClassType getService() { + return firstChild(ASTClassType.class); } /** * Returns the nodes representing the service providers, that is, * the service implementations. */ - public NodeStream getServiceProviders() { - return children(ASTClassOrInterfaceType.class).drop(1); + public NodeStream getServiceProviders() { + return children(ASTClassType.class).drop(1); } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java index b1020e0fa7..6c75bca494 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java @@ -28,8 +28,8 @@ public final class ASTModuleUsesDirective extends ASTModuleDirective { /** * Returns the node representing the consumed service. */ - public ASTClassOrInterfaceType getService() { - return firstChild(ASTClassOrInterfaceType.class); + public ASTClassType getService() { + return firstChild(ASTClassType.class); } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPermitsList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPermitsList.java index 29c0d1d394..87f9975632 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPermitsList.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPermitsList.java @@ -16,14 +16,14 @@ import net.sourceforge.pmd.lang.java.ast.ASTList.ASTNonEmptyList; * * 
  *
- *  PermitsList ::= "permits" ClassOrInterfaceType
- *                ( "," ClassOrInterfaceType )*
+ *  PermitsList ::= "permits" ClassType
+ *                ( "," ClassType )*
  *
*/ -public final class ASTPermitsList extends ASTNonEmptyList { +public final class ASTPermitsList extends ASTNonEmptyList { ASTPermitsList(int id) { - super(id, ASTClassOrInterfaceType.class); + super(id, ASTClassType.class); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReceiverParameter.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReceiverParameter.java index d7766e1aaf..ff614f0ebc 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReceiverParameter.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReceiverParameter.java @@ -31,7 +31,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; * * 
  *
- * ReceiverParameter ::= {@link ASTClassOrInterfaceType ClassOrInterfaceType} (<IDENTIFIER> ".")? "this"
+ * ReceiverParameter ::= {@link ASTClassType ClassType} (<IDENTIFIER> ".")? "this"
  *
  *
*/ @@ -58,8 +58,8 @@ public final class ASTReceiverParameter extends AbstractJavaNode { * must be {@code Identifier.this} where {@code Identifier} is the simple name of C. */ @NonNull - public ASTClassOrInterfaceType getReceiverType() { - return (ASTClassOrInterfaceType) getChild(0); + public ASTClassType getReceiverType() { + return (ASTClassType) getChild(0); } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReferenceType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReferenceType.java index 940c69d3de..bfdd8cb1e3 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReferenceType.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReferenceType.java @@ -5,12 +5,12 @@ package net.sourceforge.pmd.lang.java.ast; /** - * Represents a reference type, i.e. a {@linkplain ASTClassOrInterfaceType class or interface type}, + * Represents a reference type, i.e. a {@linkplain ASTClassType class or interface type}, * or an {@linkplain ASTArrayType array type}. * * 
  *
- *  ReferenceType ::= {@link ASTClassOrInterfaceType ClassOrInterfaceType}
+ *  ReferenceType ::= {@link ASTClassType ClassOrInterfaceType}
  *                  | {@link ASTArrayType ArrayType}
  *                  | {@link ASTIntersectionType IntersectionType}
  *                  | {@link ASTUnionType UnionType}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSuperExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSuperExpression.java
index bf91ebba8f..b565424356 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSuperExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSuperExpression.java
@@ -13,7 +13,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * 
  *
  * SuperExpression ::= "super"
- *                   | {@link ASTClassOrInterfaceType TypeName} "." "super"
+ *                   | {@link ASTClassType ClassType} "." "super"
  *
  * 

  */
@@ -24,8 +24,8 @@ public final class ASTSuperExpression extends AbstractJavaExpr implements ASTPri
 
 
     @Nullable
-    public ASTClassOrInterfaceType getQualifier() {
-        return getNumChildren() > 0 ? (ASTClassOrInterfaceType) getChild(0) : null;
+    public ASTClassType getQualifier() {
+        return getNumChildren() > 0 ? (ASTClassType) getChild(0) : null;
     }
 
     @Override
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThisExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThisExpression.java
index 7af226d5e3..145dd50dc9 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThisExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThisExpression.java
@@ -13,7 +13,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * 
  *
  * ThisExpression ::= "this"
- *                  | {@link ASTClassOrInterfaceType TypeName} "." "this"
+ *                  | {@link ASTClassType ClassType} "." "this"
  *
  * 

  */
@@ -25,8 +25,8 @@ public final class ASTThisExpression extends AbstractJavaExpr implements ASTPrim
 
 
     @Nullable
-    public ASTClassOrInterfaceType getQualifier() {
-        return getNumChildren() > 0 ? (ASTClassOrInterfaceType) getChild(0) : null;
+    public ASTClassType getQualifier() {
+        return getNumChildren() > 0 ? (ASTClassType) getChild(0) : null;
     }
 
     @Override
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThrowsList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThrowsList.java
index 5a845eea57..c9f0440eaf 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThrowsList.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThrowsList.java
@@ -11,14 +11,14 @@ import net.sourceforge.pmd.lang.java.ast.ASTList.ASTNonEmptyList;
  *
  * 
  *
- * ThrowsList ::= "throws" {@link ASTClassOrInterfaceType ClassType} ("," {@link ASTClassOrInterfaceType ClassType})*
+ * ThrowsList ::= "throws" {@link ASTClassType ClassType} ("," {@link ASTClassType ClassType})*
  *
  * 

  */
-public final class ASTThrowsList extends ASTNonEmptyList {
+public final class ASTThrowsList extends ASTNonEmptyList {
 
     ASTThrowsList(int id) {
-        super(id, ASTClassOrInterfaceType.class);
+        super(id, ASTClassType.class);
     }
 
     @Override
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java
index 799d09673c..c75aaef67e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java
@@ -75,7 +75,7 @@ public interface ASTType extends TypeNode, Annotatable, LeftRecursiveNode {
 
     @Deprecated
     default boolean isClassOrInterfaceType() {
-        return this instanceof ASTClassOrInterfaceType;
+        return this instanceof ASTClassType;
     }
 
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnionType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnionType.java
index fe08133cce..0d458c3ff4 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnionType.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnionType.java
@@ -19,7 +19,7 @@ import net.sourceforge.pmd.lang.java.ast.InternalInterfaces.AtLeastOneChildOfTyp
  *
  * 
  *
- * UnionType ::= {@link ASTClassOrInterfaceType ClassType} ("|" {@link ASTClassOrInterfaceType ClassType})+
+ * UnionType ::= {@link ASTClassType ClassType} ("|" {@link ASTClassType ClassType})+
  *
  * 

  *
@@ -27,8 +27,8 @@ import net.sourceforge.pmd.lang.java.ast.InternalInterfaces.AtLeastOneChildOfTyp
  */
 public final class ASTUnionType extends AbstractJavaTypeNode
     implements ASTReferenceType,
-               AtLeastOneChildOfType,
-               Iterable {
+               AtLeastOneChildOfType,
+               Iterable {
 
     ASTUnionType(int id) {
         super(id);
@@ -40,13 +40,13 @@ public final class ASTUnionType extends AbstractJavaTypeNode
     }
 
     /** Returns a stream of component types. */
-    public NodeStream getComponents() {
-        return children(ASTClassOrInterfaceType.class);
+    public NodeStream getComponents() {
+        return children(ASTClassType.class);
     }
 
     @Override
-    public Iterator iterator() {
-        return children(ASTClassOrInterfaceType.class).iterator();
+    public Iterator iterator() {
+        return children(ASTClassType.class).iterator();
     }
 
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AstDisambiguationPass.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AstDisambiguationPass.java
index 5f3f2c009c..fe2ef32615 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AstDisambiguationPass.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AstDisambiguationPass.java
@@ -62,7 +62,7 @@ final class AstDisambiguationPass {
     // those ignore JTypeParameterSymbol, for error handling logic to be uniform
 
 
-    private static void checkParentIsMember(ReferenceCtx ctx, ASTClassOrInterfaceType resolvedType, ASTClassOrInterfaceType parent) {
+    private static void checkParentIsMember(ReferenceCtx ctx, ASTClassType resolvedType, ASTClassType parent) {
         JTypeDeclSymbol sym = resolvedType.getReferencedSym();
         JClassSymbol parentClass = ctx.findTypeMember(sym, parent.getSimpleName(), parent);
         if (parentClass == null) {
@@ -112,7 +112,7 @@ final class AstDisambiguationPass {
             assert symbolTable != null : "Symbol tables haven't been set yet??";
 
             boolean isPackageOrTypeOnly;
-            if (name.getParent() instanceof ASTClassOrInterfaceType) {
+            if (name.getParent() instanceof ASTClassType) {
                 isPackageOrTypeOnly = true;
             } else if (name.getParent() instanceof ASTExpression) {
                 isPackageOrTypeOnly = false;
@@ -132,9 +132,9 @@ final class AstDisambiguationPass {
             if (isPackageOrTypeOnly && resolved instanceof ASTTypeExpression) {
                 // unambiguous, we just have to check that the parent is a member of the enclosing type
 
-                ASTClassOrInterfaceType resolvedType = (ASTClassOrInterfaceType) ((ASTTypeExpression) resolved).getTypeNode();
+                ASTClassType resolvedType = (ASTClassType) ((ASTTypeExpression) resolved).getTypeNode();
                 resolved = resolvedType;
-                ASTClassOrInterfaceType parent = (ASTClassOrInterfaceType) name.getParent();
+                ASTClassType parent = (ASTClassType) name.getParent();
 
                 checkParentIsMember(processor, resolvedType, parent);
             }
@@ -147,7 +147,7 @@ final class AstDisambiguationPass {
         }
 
         @Override
-        public Void visit(ASTClassOrInterfaceType type, ReferenceCtx ctx) {
+        public Void visit(ASTClassType type, ReferenceCtx ctx) {
 
             if (type.getReferencedSym() != null) {
                 return null;
@@ -165,7 +165,7 @@ final class AstDisambiguationPass {
                 return null;
             }
 
-            ASTClassOrInterfaceType lhsType = type.getQualifier();
+            ASTClassType lhsType = type.getQualifier();
             if (lhsType != null) {
                 JTypeDeclSymbol lhsSym = lhsType.getReferencedSym();
                 assert lhsSym != null : "Unresolved LHS for " + type;
@@ -190,7 +190,7 @@ final class AstDisambiguationPass {
             return null;
         }
 
-        private static void setClassSymbolIfNoQualifier(ASTClassOrInterfaceType type, ReferenceCtx ctx) {
+        private static void setClassSymbolIfNoQualifier(ASTClassType type, ReferenceCtx ctx) {
             final JTypeMirror resolved = ctx.resolveSingleTypeName(type.getSymbolTable(), type.getSimpleName(), type);
             JTypeDeclSymbol sym;
             if (resolved == null) {
@@ -206,7 +206,7 @@ final class AstDisambiguationPass {
             type.setImplicitEnclosing(enclosingType(resolved));
         }
 
-        private void postProcess(ASTClassOrInterfaceType type, ReferenceCtx ctx) {
+        private void postProcess(ASTClassType type, ReferenceCtx ctx) {
             JTypeDeclSymbol sym = type.getReferencedSym();
             if (type.getParent() instanceof ASTAnnotation) {
                 if (!(sym instanceof JClassSymbol && (sym.isUnresolved() || ((JClassSymbol) sym).isAnnotation()))) {
@@ -222,7 +222,7 @@ final class AstDisambiguationPass {
             }
         }
 
-        private static @NonNull JTypeDeclSymbol setArity(ASTClassOrInterfaceType type, ReferenceCtx ctx, String canonicalName) {
+        private static @NonNull JTypeDeclSymbol setArity(ASTClassType type, ReferenceCtx ctx, String canonicalName) {
             int arity = ASTList.sizeOrZero(type.getTypeArguments());
             return ctx.makeUnresolvedReference(canonicalName, arity);
         }
@@ -339,7 +339,7 @@ final class AstDisambiguationPass {
          *
          * @param isPackageOrTypeOnly If true, expressions are disallowed by the context, so we don't check fields
          */
-        private static ASTExpression resolveType(final @Nullable ASTClassOrInterfaceType qualifier, // lhs
+        private static ASTExpression resolveType(final @Nullable ASTClassType qualifier, // lhs
                                                  final @Nullable JClassType implicitEnclosing,      // enclosing type, if it is implicitly inherited
                                                  final JTypeDeclSymbol sym,                         // symbol for the type
                                                  final boolean isFqcn,                              // whether this is a fully-qualified name
@@ -351,7 +351,7 @@ final class AstDisambiguationPass {
 
             TokenUtils.expectKind(identifier, JavaTokenKinds.IDENTIFIER);
 
-            final ASTClassOrInterfaceType type = new ASTClassOrInterfaceType(qualifier, isFqcn, ambig.getFirstToken(), identifier);
+            final ASTClassType type = new ASTClassType(qualifier, isFqcn, ambig.getFirstToken(), identifier);
             type.setSymbol(sym);
             type.setImplicitEnclosing(implicitEnclosing);
 
@@ -451,7 +451,7 @@ final class AstDisambiguationPass {
          * The parent type's image is set to a package name + simple name.
          */
         private static void forceResolveAsFullPackageNameOfParent(StringBuilder packageImage, ASTAmbiguousName ambig, ReferenceCtx ctx) {
-            ASTClassOrInterfaceType parent = (ASTClassOrInterfaceType) ambig.getParent();
+            ASTClassType parent = (ASTClassType) ambig.getParent();
 
             packageImage.append('.').append(parent.getSimpleName());
             String fullName = packageImage.toString();
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/InternalApiBridge.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/InternalApiBridge.java
index d8f536eeaf..ea7b90c5f6 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/InternalApiBridge.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/InternalApiBridge.java
@@ -208,7 +208,7 @@ public final class InternalApiBridge {
         return TypesFromAst.fromAst(ts, lexicalSubst, node);
     }
 
-    public static JTypeDeclSymbol getReferencedSym(ASTClassOrInterfaceType type) {
+    public static JTypeDeclSymbol getReferencedSym(ASTClassType type) {
         return type.getReferencedSym();
     }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaVisitorBase.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaVisitorBase.java
index a2d120b871..5c4b43e381 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaVisitorBase.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaVisitorBase.java
@@ -119,7 +119,7 @@ public class JavaVisitorBase extends AstVisitorBase implements JavaV
     }
 
     @Override
-    public R visit(ASTClassOrInterfaceType node, P data) {
+    public R visit(ASTClassType node, P data) {
         return visitReferenceType(node, data);
     }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/TypesFromAst.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/TypesFromAst.java
index a7cdbc4792..0f5680cc2b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/TypesFromAst.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/TypesFromAst.java
@@ -55,9 +55,9 @@ final class TypesFromAst {
 
     private static JTypeMirror fromAstImpl(TypeSystem ts, Substitution lexicalSubst, ASTType node) {
 
-        if (node instanceof ASTClassOrInterfaceType) {
+        if (node instanceof ASTClassType) {
 
-            return makeFromClassType(ts, (ASTClassOrInterfaceType) node, lexicalSubst);
+            return makeFromClassType(ts, (ASTClassType) node, lexicalSubst);
 
         } else if (node instanceof ASTWildcardType) {
 
@@ -122,7 +122,7 @@ final class TypesFromAst {
     }
 
 
-    private static JTypeMirror makeFromClassType(TypeSystem ts, ASTClassOrInterfaceType node, Substitution subst) {
+    private static JTypeMirror makeFromClassType(TypeSystem ts, ASTClassType node, Substitution subst) {
         if (node == null) {
             return null;
         }
@@ -159,7 +159,7 @@ final class TypesFromAst {
         }
     }
 
-    private static @Nullable JClassType getEnclosing(TypeSystem ts, ASTClassOrInterfaceType node, Substitution subst, @Nullable ASTClassOrInterfaceType lhsType, JTypeDeclSymbol reference) {
+    private static @Nullable JClassType getEnclosing(TypeSystem ts, ASTClassType node, Substitution subst, @Nullable ASTClassType lhsType, JTypeDeclSymbol reference) {
         @Nullable JTypeMirror enclosing = makeFromClassType(ts, lhsType, subst);
 
         if (enclosing != null && !shouldEnclose(reference)) {
@@ -199,7 +199,7 @@ final class TypesFromAst {
             && !Modifier.isStatic(reference.getModifiers());
     }
 
-    private static @NonNull JTypeDeclSymbol getReferenceEnsureResolved(ASTClassOrInterfaceType node) {
+    private static @NonNull JTypeDeclSymbol getReferenceEnsureResolved(ASTClassType node) {
         if (node.getReferencedSym() != null) {
             return node.getReferencedSym();
         } else if (node.getParent() instanceof ASTConstructorCall) {
@@ -246,7 +246,7 @@ final class TypesFromAst {
      */
     private static @Nullable Annotatable getEnclosingAnnotationGiver(JavaNode node) {
         JavaNode parent = node.getParent();
-        if (node.getIndexInParent() == 0 && parent instanceof ASTClassOrInterfaceType) {
+        if (node.getIndexInParent() == 0 && parent instanceof ASTClassType) {
             // this is an enclosing type
             return getEnclosingAnnotationGiver(parent);
         } else if (node.getIndexInParent() == 0 && parent instanceof ASTArrayType) {
@@ -262,7 +262,7 @@ final class TypesFromAst {
 
     private static PSet getTypeAnnotations(ASTType type) {
         PSet annotsOnType = getSymbolicAnnotations(type);
-        if (type instanceof ASTClassOrInterfaceType && ((ASTClassOrInterfaceType) type).getQualifier() != null) {
+        if (type instanceof ASTClassType && ((ASTClassType) type).getQualifier() != null) {
             return annotsOnType; // annots on the declaration only apply to the leftmost qualifier
         }
         Annotatable parent = getEnclosingAnnotationGiver(type);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/internal/JavaAstUtils.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/internal/JavaAstUtils.java
index 6b519f1c49..dccffcbe00 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/internal/JavaAstUtils.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/internal/JavaAstUtils.java
@@ -37,7 +37,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTBooleanLiteral;
 import net.sourceforge.pmd.lang.java.ast.ASTBreakStatement;
 import net.sourceforge.pmd.lang.java.ast.ASTCastExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTCatchClause;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorCall;
 import net.sourceforge.pmd.lang.java.ast.ASTExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTExpressionStatement;
@@ -205,12 +205,12 @@ public final class JavaAstUtils {
      */
     @SafeVarargs
     public static boolean hasExceptionList(ASTMethodOrConstructorDeclaration node, Class... types) {
-        @NonNull List formals = ASTList.orEmpty(node.getThrowsList());
+        @NonNull List formals = ASTList.orEmpty(node.getThrowsList());
         if (formals.size() != types.length) {
             return false;
         }
         for (int i = 0; i < formals.size(); i++) {
-            ASTClassOrInterfaceType fi = formals.get(i);
+            ASTClassType fi = formals.get(i);
             if (!TypeTestUtil.isExactlyA(types[i], fi)) {
                 return false;
             }
@@ -610,7 +610,7 @@ public final class JavaAstUtils {
             && mtype.getSymbol().getEnclosingClass().equals(call.getEnclosingType().getSymbol());
     }
 
-    public static ASTClassOrInterfaceType getThisOrSuperQualifier(ASTExpression expr) {
+    public static ASTClassType getThisOrSuperQualifier(ASTExpression expr) {
         if (expr instanceof ASTThisExpression) {
             return ((ASTThisExpression) expr).getQualifier();
         } else if (expr instanceof ASTSuperExpression) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/internal/PrettyPrintingUtil.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/internal/PrettyPrintingUtil.java
index 730a477e9d..7693887aeb 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/internal/PrettyPrintingUtil.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/internal/PrettyPrintingUtil.java
@@ -16,7 +16,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTArrayType;
 import net.sourceforge.pmd.lang.java.ast.ASTCastExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTClassLiteral;
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTEnumDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTExpression;
@@ -95,8 +95,8 @@ public final class PrettyPrintingUtil {
     private static void prettyPrintTypeNode(StringBuilder sb, ASTType t) {
         if (t instanceof ASTPrimitiveType) {
             sb.append(((ASTPrimitiveType) t).getKind().getSimpleName());
-        } else if (t instanceof ASTClassOrInterfaceType) {
-            ASTClassOrInterfaceType classT = (ASTClassOrInterfaceType) t;
+        } else if (t instanceof ASTClassType) {
+            ASTClassType classT = (ASTClassType) t;
             sb.append(classT.getSimpleName());
 
             ASTTypeArguments targs = classT.getTypeArguments();
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaDesignerBindings.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaDesignerBindings.java
index 3cd39d64d8..28f44e711a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaDesignerBindings.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaDesignerBindings.java
@@ -18,7 +18,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTAnnotation;
 import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTAssignableExpr.ASTNamedReferenceExpr;
 import net.sourceforge.pmd.lang.java.ast.ASTAssignmentExpression;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTCompactConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTFieldAccess;
@@ -158,7 +158,7 @@ public final class JavaDesignerBindings extends DefaultDesignerBindings {
         }
 
         @Override
-        public Attribute visit(ASTClassOrInterfaceType node, Void data) {
+        public Attribute visit(ASTClassType node, Void data) {
             return new Attribute(node, "SimpleName", node.getSimpleName());
         }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/internal/ClassFanOutVisitor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/internal/ClassFanOutVisitor.java
index 3ee69e4b09..ed144f64de 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/internal/ClassFanOutVisitor.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/internal/ClassFanOutVisitor.java
@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.java.metrics.internal;
 
 import java.util.Set;
 
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTExpression;
 import net.sourceforge.pmd.lang.java.ast.JavaVisitorBase;
 import net.sourceforge.pmd.lang.java.ast.TypeNode;
@@ -48,7 +48,7 @@ public final class ClassFanOutVisitor extends JavaVisitorBase,
     }
 
     @Override
-    public Void visit(ASTClassOrInterfaceType node, Set data) {
+    public Void visit(ASTClassType node, Set data) {
         check(node, data);
         return visitChildren(node, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingRule.java
index 78f4812477..8f9be1aae0 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingRule.java
@@ -14,7 +14,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTArrayType;
 import net.sourceforge.pmd.lang.java.ast.ASTBlock;
 import net.sourceforge.pmd.lang.java.ast.ASTCastExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTClassLiteral;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorCall;
 import net.sourceforge.pmd.lang.java.ast.ASTExtendsList;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
@@ -37,12 +37,12 @@ public class LooseCouplingRule extends AbstractJavaRulechainRule {
                        .build();
 
     public LooseCouplingRule() {
-        super(ASTClassOrInterfaceType.class);
+        super(ASTClassType.class);
         definePropertyDescriptor(ALLOWED_TYPES);
     }
 
     @Override
-    public Object visit(ASTClassOrInterfaceType node, Object data) {
+    public Object visit(ASTClassType node, Object data) {
         if (isConcreteCollectionType(node)
             && !isInOverriddenMethodSignature(node)
             && !isInAllowedSyntacticCtx(node)
@@ -53,13 +53,13 @@ public class LooseCouplingRule extends AbstractJavaRulechainRule {
         return null;
     }
 
-    private boolean isInAllowedSyntacticCtx(ASTClassOrInterfaceType node) {
+    private boolean isInAllowedSyntacticCtx(ASTClassType node) {
         JavaNode parent = node.getParent();
         return parent instanceof ASTConstructorCall      // new ArrayList<>()
             || parent instanceof ASTTypeExpression       // instanceof, method reference
             || parent instanceof ASTCastExpression       // if we allow instanceof, we should allow cast
             || parent instanceof ASTClassLiteral         // ArrayList.class
-            || parent instanceof ASTClassOrInterfaceType // AbstractMap.SimpleEntry
+            || parent instanceof ASTClassType // AbstractMap.SimpleEntry
             || parent instanceof ASTExtendsList          // extends AbstractMap<...>
             || parent instanceof ASTThisExpression       // Enclosing.this
             || parent instanceof ASTSuperExpression      // Enclosing.super
@@ -67,7 +67,7 @@ public class LooseCouplingRule extends AbstractJavaRulechainRule {
             || parent instanceof ASTArrayType && parent.getParent() instanceof ASTArrayAllocation;
     }
 
-    private boolean isAllowedType(ASTClassOrInterfaceType node) {
+    private boolean isAllowedType(ASTClassType node) {
         for (String allowed : getProperty(ALLOWED_TYPES)) {
             if (TypeTestUtil.isA(allowed, node)) {
                 return true;
@@ -77,7 +77,7 @@ public class LooseCouplingRule extends AbstractJavaRulechainRule {
     }
 
 
-    private boolean isConcreteCollectionType(ASTClassOrInterfaceType node) {
+    private boolean isConcreteCollectionType(ASTClassType node) {
         return (TypeTestUtil.isA(Collection.class, node) || TypeTestUtil.isA(Map.class, node))
             && !node.getTypeMirror().isInterface();
     }
@@ -88,7 +88,7 @@ public class LooseCouplingRule extends AbstractJavaRulechainRule {
         return ancestor instanceof ASTMethodDeclaration && ((ASTMethodDeclaration) ancestor).isOverridden();
     }
 
-    private boolean isTypeParameter(ASTClassOrInterfaceType node) {
+    private boolean isTypeParameter(ASTClassType node) {
         return node.getTypeMirror().isTypeVariable();
     }
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PrimitiveWrapperInstantiationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PrimitiveWrapperInstantiationRule.java
index a43f94f73d..680516ff8f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PrimitiveWrapperInstantiationRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PrimitiveWrapperInstantiationRule.java
@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices;
 
 import net.sourceforge.pmd.lang.java.ast.ASTArgumentList;
 import net.sourceforge.pmd.lang.java.ast.ASTBooleanLiteral;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorCall;
 import net.sourceforge.pmd.lang.java.ast.ASTExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodCall;
@@ -26,7 +26,7 @@ public class PrimitiveWrapperInstantiationRule extends AbstractJavaRulechainRule
 
     @Override
     public Object visit(ASTConstructorCall node, Object data) {
-        ASTClassOrInterfaceType type = node.firstChild(ASTClassOrInterfaceType.class);
+        ASTClassType type = node.firstChild(ASTClassType.class);
         if (type == null) {
             return data;
         }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java
index 79ca132157..c2b72d4d03 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java
@@ -13,7 +13,7 @@ import java.util.function.Function;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTFieldAccess;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodCall;
 import net.sourceforge.pmd.lang.java.ast.ASTTypeExpression;
@@ -47,27 +47,27 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRulechainRule
             .build();
 
     public UnnecessaryFullyQualifiedNameRule() {
-        super(ASTClassOrInterfaceType.class);
+        super(ASTClassType.class);
         definePropertyDescriptor(REPORT_METHODS);
         definePropertyDescriptor(REPORT_FIELDS);
     }
 
     @Override
-    public Object visit(final ASTClassOrInterfaceType deepest, Object data) {
+    public Object visit(final ASTClassType deepest, Object data) {
         if (deepest.getQualifier() != null) {
             // the child will be visited instead
             return data;
         }
 
-        ASTClassOrInterfaceType next = deepest;
+        ASTClassType next = deepest;
         ScopeInfo bestReason = null;
         if (next.isFullyQualified()) {
             bestReason = typeMeansSame(next);
         }
 
         // try to find the longest prefix that can be removed
-        while (bestReason != null && segmentIsIrrelevant(next) && next.getParent() instanceof ASTClassOrInterfaceType) {
-            ASTClassOrInterfaceType nextParent = (ASTClassOrInterfaceType) next.getParent();
+        while (bestReason != null && segmentIsIrrelevant(next) && next.getParent() instanceof ASTClassType) {
+            ASTClassType nextParent = (ASTClassType) next.getParent();
             ScopeInfo newBestReason = typeMeansSame(nextParent);
             if (newBestReason == null) {
                 break;
@@ -114,15 +114,15 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRulechainRule
     }
 
 
-    private String produceQualifier(ASTClassOrInterfaceType startIncluded, ASTClassOrInterfaceType stopExcluded, boolean includeLast) {
+    private String produceQualifier(ASTClassType startIncluded, ASTClassType stopExcluded, boolean includeLast) {
         StringBuilder sb = new StringBuilder();
         if (startIncluded.isFullyQualified()) {
             sb.append(startIncluded.getTypeMirror().getSymbol().getPackageName());
         }
-        ASTClassOrInterfaceType nextSimpleName = startIncluded;
+        ASTClassType nextSimpleName = startIncluded;
         while (nextSimpleName != stopExcluded) { // NOPMD we want identity comparison
             sb.append('.').append(nextSimpleName.getSimpleName());
-            nextSimpleName = (ASTClassOrInterfaceType) nextSimpleName.getParent();
+            nextSimpleName = (ASTClassType) nextSimpleName.getParent();
         }
         if (includeLast) {
             if (sb.length() == 0) {
@@ -133,7 +133,7 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRulechainRule
         return sb.toString();
     }
 
-    private boolean segmentIsIrrelevant(ASTClassOrInterfaceType type) {
+    private boolean segmentIsIrrelevant(ASTClassType type) {
         return type.getTypeArguments() == null && type.getDeclaredAnnotations().isEmpty();
     }
 
@@ -145,7 +145,7 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRulechainRule
      *
      * @return The reason why the type is in scope. Null if it's not in scope.
      */
-    private static @Nullable ScopeInfo typeMeansSame(@NonNull ASTClassOrInterfaceType typeNode) {
+    private static @Nullable ScopeInfo typeMeansSame(@NonNull ASTClassType typeNode) {
         JTypeDeclSymbol sym = typeNode.getTypeMirror().getSymbol();
         if (sym == null || sym.isUnresolved()) {
             return null;
@@ -221,7 +221,7 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRulechainRule
         return null;
     }
 
-    private static String formatMemberName(ASTClassOrInterfaceType qualifier, JAccessibleElementSymbol call) {
+    private static String formatMemberName(ASTClassType qualifier, JAccessibleElementSymbol call) {
         JClassSymbol methodOwner = call.getEnclosingClass();
         if (methodOwner != null && !methodOwner.equals(qualifier.getTypeMirror().getSymbol())) {
             return methodOwner.getSimpleName() + "::" + call.getSimpleName();
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportRule.java
index cef8eea7c5..eadac36127 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportRule.java
@@ -13,7 +13,7 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
 
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
 import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodCall;
@@ -217,7 +217,7 @@ public class UnnecessaryImportRule extends AbstractJavaRule {
     }
 
     @Override
-    public Object visit(ASTClassOrInterfaceType node, Object data) {
+    public Object visit(ASTClassType node, Object data) {
         if (node.getQualifier() == null
             && !node.isFullyQualified()
             && node.getTypeMirror().isClassOrInterface()) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorRule.java
index 080e453295..68a217547a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorRule.java
@@ -12,7 +12,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import net.sourceforge.pmd.lang.java.ast.ASTArgumentList;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorCall;
 import net.sourceforge.pmd.lang.java.ast.ASTExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTTypeArguments;
@@ -65,7 +65,7 @@ public class UseDiamondOperatorRule extends AbstractJavaRulechainRule {
 
     @Override
     public Object visit(ASTConstructorCall ctorCall, Object data) {
-        ASTClassOrInterfaceType newTypeNode = ctorCall.getTypeNode();
+        ASTClassType newTypeNode = ctorCall.getTypeNode();
         JTypeMirror newType = newTypeNode.getTypeMirror();
 
         ASTTypeArguments targs = newTypeNode.getTypeArguments();
@@ -157,13 +157,13 @@ public class UseDiamondOperatorRule extends AbstractJavaRulechainRule {
         return sb.append(argsString).toString();
     }
 
-    private static StringBuilder produceSameTypeWithDiamond(ASTClassOrInterfaceType type, StringBuilder sb, boolean topLevel) {
+    private static StringBuilder produceSameTypeWithDiamond(ASTClassType type, StringBuilder sb, boolean topLevel) {
         if (type.isFullyQualified()) {
             JTypeDeclSymbol sym = type.getTypeMirror().getSymbol();
             Objects.requireNonNull(sym);
             sb.append(sym.getPackageName()).append('.');
         } else {
-            ASTClassOrInterfaceType qualifier = type.getQualifier();
+            ASTClassType qualifier = type.getQualifier();
             if (qualifier != null) {
                 produceSameTypeWithDiamond(qualifier, sb, false).append('.');
             }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/multithreading/UnsynchronizedStaticFormatterRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/multithreading/UnsynchronizedStaticFormatterRule.java
index 90a0c2d7fe..1de52aa1aa 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/multithreading/UnsynchronizedStaticFormatterRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/multithreading/UnsynchronizedStaticFormatterRule.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.java.ast.ASTAssignableExpr.ASTNamedReferenceExpr;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodCall;
@@ -62,7 +62,7 @@ public class UnsynchronizedStaticFormatterRule extends AbstractJavaRulechainRule
         if (!node.hasModifiers(JModifier.STATIC)) {
             return data;
         }
-        ASTClassOrInterfaceType cit = node.descendants(ASTClassOrInterfaceType.class).first();
+        ASTClassType cit = node.descendants(ASTClassType.class).first();
         if (cit == null || !TypeTestUtil.isA(formatterClassToCheck, cit)) {
             return data;
         }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/BaseContextNodeTestFun.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/BaseContextNodeTestFun.java
index e40914cc75..2338c47e3a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/BaseContextNodeTestFun.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/BaseContextNodeTestFun.java
@@ -24,7 +24,7 @@ import net.sf.saxon.value.SequenceType;
  * XPath function {@code pmd-java:typeIs(typeName as xs:string) as xs:boolean}
  * and {@code typeIsExactly}.
  *
- * 
Example XPath 2.0: {@code //ClassOrInterfaceType[pmd-java:typeIs('java.lang.String')]}
+ * 
Example XPath 2.0: {@code //ClassType[pmd-java:typeIs('java.lang.String')]}
  *
  * 
Returns true if the type of the node matches, false otherwise.
  */
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/ast/AstClassSym.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/ast/AstClassSym.java
index a17a3e3159..6597e9452e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/ast/AstClassSym.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/ast/AstClassSym.java
@@ -17,7 +17,7 @@ import org.pcollections.PSet;
 import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTBodyDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorCall;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTEnumConstant;
@@ -227,7 +227,7 @@ final class AstClassSym
 
         } else if (node instanceof ASTClassOrInterfaceDeclaration) {
 
-            ASTClassOrInterfaceType superClass = ((ASTClassOrInterfaceDeclaration) node).getSuperClassTypeNode();
+            ASTClassType superClass = ((ASTClassOrInterfaceDeclaration) node).getSuperClassTypeNode();
             return superClass == null
                    ? ts.OBJECT
                    // this cast relies on the fact that the superclass is not a type variable
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/JSymbolTable.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/JSymbolTable.java
index b5a38e4967..7a97d0d0db 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/JSymbolTable.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/JSymbolTable.java
@@ -5,7 +5,7 @@
 package net.sourceforge.pmd.lang.java.symbols.table;
 
 import net.sourceforge.pmd.annotation.Experimental;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTVariableAccess;
 import net.sourceforge.pmd.lang.java.symbols.table.coreimpl.ShadowChain;
 import net.sourceforge.pmd.lang.java.types.JMethodSig;
@@ -56,7 +56,7 @@ public interface JSymbolTable {
      * in the outer expression. It depends on the type of the left hand expression,
      * which may be an arbitrary expression. {@code types().resolve("Inner")} will
      * return a symbol that is not necessarily the actual reference for {@code Outer.Inner},
-     * or no symbol at all. {@link ASTClassOrInterfaceType#getTypeMirror()}
+     * or no symbol at all. {@link ASTClassType#getTypeMirror()}
      * will be accurate though.
      * 
      */
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/internal/SymbolTableResolver.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/internal/SymbolTableResolver.java
index b1843f018a..fa0dc55f6f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/internal/SymbolTableResolver.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/internal/SymbolTableResolver.java
@@ -29,7 +29,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTBlock;
 import net.sourceforge.pmd.lang.java.ast.ASTBreakStatement;
 import net.sourceforge.pmd.lang.java.ast.ASTCatchClause;
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTClassType;
 import net.sourceforge.pmd.lang.java.ast.ASTCompactConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
 import net.sourceforge.pmd.lang.java.ast.ASTConditionalExpression;
@@ -166,7 +166,7 @@ public final class SymbolTableResolver {
         }
 
         @Override
-        public Void visit(ASTClassOrInterfaceType node, @NonNull ReferenceCtx data) {
+        public Void visit(ASTClassType node, @NonNull ReferenceCtx data) {
             // all types are disambiguated in this resolver, because
             // the symbols available inside the body of an anonymous class
             // depend on the type of the superclass/superinterface (the Runnable in `new Runnable() { }`).
diff --git a/pmd-java/src/main/resources/category/java/bestpractices.xml b/pmd-java/src/main/resources/category/java/bestpractices.xml
index 7843f7d1fa..7c5e836d1d 100644
--- a/pmd-java/src/main/resources/category/java/bestpractices.xml
+++ b/pmd-java/src/main/resources/category/java/bestpractices.xml
@@ -147,7 +147,7 @@ public class Foo {
             
                 
                     
                 
             
@@ -347,7 +347,7 @@ if held within objects with long lifetimes.
             
                 
 
                 
             
@@ -643,7 +643,7 @@ through the @RunWith(Suite.class) annotation.
             
                 
 
                 
@@ -1252,7 +1252,7 @@ Consider replacing Enumeration usages with the newer java.util.Iterator
             
                 
 
                 
             
@@ -1285,7 +1285,7 @@ Consider replacing Hashtable usage with the newer java.util.Map if thread safety
         
             
                 
             
         
@@ -1313,7 +1313,7 @@ Consider replacing Vector usages with the newer java.util.ArrayList if expensive
         
             
                 
             
         
@@ -1803,8 +1803,8 @@ Byte arrays in any method and String arrays in `public static void main(String[]
 //FormalParameters[not(parent::MethodDeclaration[@Overridden=true() or @MainMethod=true()])]
   /FormalParameter[position()=last()]
    [@Varargs=false()]
-   [ArrayType[not(PrimitiveType[@Kind = "byte"] or ClassOrInterfaceType[pmd-java:typeIs('java.lang.Byte')])]
-    or VariableDeclaratorId[ArrayDimensions] and (PrimitiveType[not(@Kind="byte")] or ClassOrInterfaceType[not(pmd-java:typeIs('java.lang.Byte'))])]
+   [ArrayType[not(PrimitiveType[@Kind = "byte"] or ClassType[pmd-java:typeIs('java.lang.Byte')])]
+    or VariableDeclaratorId[ArrayDimensions] and (PrimitiveType[not(@Kind="byte")] or ClassType[not(pmd-java:typeIs('java.lang.Byte'))])]
 ]]>
                 
             
diff --git a/pmd-java/src/main/resources/category/java/codestyle.xml b/pmd-java/src/main/resources/category/java/codestyle.xml
index 9603f12881..f8117045de 100644
--- a/pmd-java/src/main/resources/category/java/codestyle.xml
+++ b/pmd-java/src/main/resources/category/java/codestyle.xml
@@ -145,7 +145,7 @@ and increases the maintenance burden.
         2
         
             
-                //MethodCall[TypeExpression/ClassOrInterfaceType[pmd-java:typeIs('java.lang.System')]
+                //MethodCall[TypeExpression/ClassType[pmd-java:typeIs('java.lang.System')]
                                     and @MethodName = 'loadLibrary']
             
         
@@ -517,7 +517,7 @@ class Foo {
             
                 
 
                 
             
@@ -1978,7 +1978,7 @@ public class Foo {
             
                 
 
                 
diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index f66e3bbebb..6fb8389859 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -61,7 +61,7 @@ Avoid catching generic exceptions such as NullPointerException, RuntimeException
             
                 
 
@@ -255,7 +255,7 @@ Exception, or Error, use a subclassed exception or error instead.
                 
 
                 
 
                 
             
@@ -589,7 +589,7 @@ Errors are system exceptions. Do not extend them.
             
                 
 
                 
             
diff --git a/pmd-java/src/main/resources/category/java/errorprone.xml b/pmd-java/src/main/resources/category/java/errorprone.xml
index 2c4d7bf423..988a32ca5a 100644
--- a/pmd-java/src/main/resources/category/java/errorprone.xml
+++ b/pmd-java/src/main/resources/category/java/errorprone.xml
@@ -241,7 +241,7 @@ original error, causing other, more subtle problems later on.
             
                 
 
                 
             
@@ -274,7 +274,7 @@ OutOfMemoryError that should be exposed and managed separately.
         
             
                 
             
         
@@ -834,7 +834,7 @@ in a `ClassCastException`.
             
                 
 
                 
@@ -944,7 +944,7 @@ Note: Such a covariant return type is only possible with Java 1.5 or higher.
 //MethodDeclaration
     [@Name = 'clone']
     [@Arity = 0]
-    [ClassOrInterfaceType[1]/@SimpleName != ancestor::ClassOrInterfaceDeclaration[1]/@SimpleName]
+    [ClassType[1]/@SimpleName != ancestor::ClassOrInterfaceDeclaration[1]/@SimpleName]
 ]]>
                 
             
@@ -1250,7 +1250,7 @@ Extend Exception or RuntimeException instead of Throwable.
             
                 
 
                 
@@ -2319,7 +2319,7 @@ chain needs an own serialVersionUID field. See also [Should an abstract class ha
 //ClassOrInterfaceDeclaration
     [@Interface = false()]
     [count(ClassOrInterfaceBody/FieldDeclaration/VariableDeclarator/VariableDeclaratorId[@Name='serialVersionUID']) = 0]
-    [(ImplementsList | ExtendsList)/ClassOrInterfaceType[pmd-java:typeIs('java.io.Serializable')]]
+    [(ImplementsList | ExtendsList)/ClassType[pmd-java:typeIs('java.io.Serializable')]]
 ]]>
                 
             
@@ -2389,7 +2389,7 @@ $topLevelClass[
                 [descendant::ReturnStatement/*[1][pmd-java:typeIs(ancestor::ClassOrInterfaceDeclaration[@Nested = false()]/@BinaryName)]]
             ) or (
                 (: … or the inner class extends the outer class :)
-                ExtendsList/ClassOrInterfaceType[@SimpleName = ancestor::ClassOrInterfaceDeclaration[@Nested = false()]/@SimpleName]
+                ExtendsList/ClassType[@SimpleName = ancestor::ClassOrInterfaceDeclaration[@Nested = false()]/@SimpleName]
             )]
     )]
 ]]>
@@ -2428,7 +2428,7 @@ log4j2 (since 6.19.0).
                 
 
                 
 
                 
 
                 
@@ -150,7 +150,7 @@ Also, EJBs might be moved between machines in a cluster and only managed resourc
             
                 
 
                 
 
                 
 
                 
             
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java
index a6f5fbc617..298a2732ee 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java
@@ -28,7 +28,7 @@ class ASTVariableDeclaratorIdTest extends BaseParserTest {
         ASTCompilationUnit acu = java.parse(TYPE_NAME_NODE);
         ASTVariableDeclaratorId id = acu.findDescendantsOfType(ASTVariableDeclaratorId.class).get(0);
 
-        ASTClassOrInterfaceType name = (ASTClassOrInterfaceType) id.getTypeNameNode();
+        ASTClassType name = (ASTClassType) id.getTypeNameNode();
         assertEquals("String", name.getSimpleName());
     }
 
@@ -37,7 +37,7 @@ class ASTVariableDeclaratorIdTest extends BaseParserTest {
         ASTCompilationUnit acu = java.parse(TEST_ANNOTATIONS);
         ASTVariableDeclaratorId id = acu.findDescendantsOfType(ASTVariableDeclaratorId.class).get(0);
 
-        ASTClassOrInterfaceType name = (ASTClassOrInterfaceType) id.getTypeNode();
+        ASTClassType name = (ASTClassType) id.getTypeNode();
         assertEquals("String", name.getSimpleName());
     }
 
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java10Test.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java10Test.java
index 8fc01f0633..7b46a8909b 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java10Test.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java10Test.java
@@ -42,7 +42,7 @@ class Java10Test {
         ASTVariableDeclaratorId varId = localVars.get(0).getVarIds().firstOrThrow();
 
         // first: var list = new ArrayList();
-        assertTrue(varId.getTypeNode() instanceof ASTClassOrInterfaceType);
+        assertTrue(varId.getTypeNode() instanceof ASTClassType);
         // in that case, we don't have a class named "var", so the type will be null
         assertTrue(varId.getTypeMirror().getSymbol().isUnresolved());
 
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java
index 1b8de97629..6b88b64966 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java
@@ -102,8 +102,8 @@ class XPathRuleTest {
 
     @Test
     void testSimpleQueryIsRuleChain2() {
-        // docOrder(((/)/descendant-or-self::node())/(child::element(ClassOrInterfaceType)[typeIs("java.util.Vector")]))
-        assertIsRuleChain("//ClassOrInterfaceType[pmd-java:typeIs('java.util.Vector')]");
+        // docOrder(((/)/descendant-or-self::node())/(child::element(ClassType)[typeIs("java.util.Vector")]))
+        assertIsRuleChain("//ClassType[pmd-java:typeIs('java.util.Vector')]");
     }
 
     private void assertIsRuleChain(String xpath) {
@@ -127,7 +127,7 @@ class XPathRuleTest {
         final String source = "public interface dummy extends Foo, Bar, Baz {}";
         ASTCompilationUnit cu = JavaParsingHelper.DEFAULT.parse(source);
 
-        String xpath = "//ExtendsList/ClassOrInterfaceType/following-sibling::ClassOrInterfaceType";
+        String xpath = "//ExtendsList/ClassType/following-sibling::ClassType";
 
 
         SaxonXPathRuleQuery xpathRuleQuery = new SaxonXPathRuleQuery(xpath,
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTMethodReferenceTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTMethodReferenceTest.kt
index 304acf7414..55ab0f5d51 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTMethodReferenceTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTMethodReferenceTest.kt
@@ -246,5 +246,5 @@ class ASTMethodReferenceTest : ParserTestSpec({
 
 
 
-fun ASTClassOrInterfaceType.getAmbiguousLhs(): ASTAmbiguousName? =
+fun ASTClassType.getAmbiguousLhs(): ASTAmbiguousName? =
         children(ASTAmbiguousName::class.java).first()
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TestExtensions.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TestExtensions.kt
index 412d37da07..f5b03bf2ff 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TestExtensions.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TestExtensions.kt
@@ -104,7 +104,7 @@ fun TreeNodeWrapper.enumBody(contents: NodeSpec = EmptyAss
             contents()
         }
 
-fun TreeNodeWrapper.thisExpr(qualifier: ValuedNodeSpec = { null }) =
+fun TreeNodeWrapper.thisExpr(qualifier: ValuedNodeSpec = { null }) =
         child {
             it::getQualifier shouldBe qualifier()
         }
@@ -372,14 +372,14 @@ fun TreeNodeWrapper.typeParam(name: String, contents: ValuedNodeSpec.classType(simpleName: String, contents: NodeSpec = EmptyAssertions) =
-        child(ignoreChildren = contents == EmptyAssertions) {
+fun TreeNodeWrapper.classType(simpleName: String, contents: NodeSpec = EmptyAssertions) =
+        child(ignoreChildren = contents == EmptyAssertions) {
             it::getSimpleName shouldBe simpleName
             contents()
         }
 
-fun TreeNodeWrapper.qualClassType(canoName: String, contents: NodeSpec = EmptyAssertions) =
-        child(ignoreChildren = contents == EmptyAssertions) {
+fun TreeNodeWrapper.qualClassType(canoName: String, contents: NodeSpec = EmptyAssertions) =
+        child(ignoreChildren = contents == EmptyAssertions) {
             val simpleName = canoName.substringAfterLast('.')
             it::getSimpleName shouldBe simpleName
             it.text.toString() shouldBe canoName
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TypeDisambiguationTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TypeDisambiguationTest.kt
index 3a7cd8ab47..85d0ace2b2 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TypeDisambiguationTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TypeDisambiguationTest.kt
@@ -11,7 +11,6 @@ import io.kotest.matchers.types.shouldBeSameInstanceAs
 import net.sourceforge.pmd.lang.ast.test.*
 import net.sourceforge.pmd.lang.ast.test.shouldBe
 import net.sourceforge.pmd.lang.java.symbols.JClassSymbol
-import net.sourceforge.pmd.lang.java.symbols.table.internal.JavaSemanticErrors
 import net.sourceforge.pmd.lang.java.symbols.table.internal.JavaSemanticErrors.*
 import net.sourceforge.pmd.lang.java.types.JClassType
 import kotlin.test.assertEquals
@@ -33,7 +32,7 @@ class TypeDisambiguationTest : ParserTestSpec({
         val (foo, inner) = acu.descendants(ASTAnyTypeDeclaration::class.java).toList { it.symbol }
         val (f1) = acu.descendants(ASTFieldDeclaration::class.java).toList()
 
-        f1.typeNode.shouldMatchNode {
+        f1.typeNode.shouldMatchNode {
             it::isFullyQualified shouldBe false
             it::getSimpleName shouldBe "Inner"
             it::getReferencedSym shouldBe inner
@@ -109,13 +108,13 @@ class TypeDisambiguationTest : ParserTestSpec({
         """)
 
         val (foo) = acu.descendants(ASTAnyTypeDeclaration::class.java).toList()
-        val (fooBar) = acu.descendants(ASTClassOrInterfaceType::class.java).toList()
+        val (fooBar) = acu.descendants(ASTClassType::class.java).toList()
 
 
         doTest("Unresolved inner type should produce a warning") {
             val (node, args) = logger.warnings[CANNOT_RESOLVE_MEMBER]!![0]
             args.map { it.toString() } shouldBe listOf("Bar", "com.Foo", "an unresolved type")
-            node.shouldBeA { }
+            node.shouldBeA { }
         }
 
         doTest("Unresolved inner type should have a symbol anyway") {
@@ -151,7 +150,7 @@ class TypeDisambiguationTest : ParserTestSpec({
         """)
 
         val (refInFoo, refInScratch) = acu.descendants(ASTFieldDeclaration::class.java)
-            .crossFindBoundaries().map { it.typeNode as ASTClassOrInterfaceType }.toList()
+            .crossFindBoundaries().map { it.typeNode as ASTClassType }.toList()
         val (_, _, aMem) = acu.descendants(ASTClassOrInterfaceDeclaration::class.java)
             .crossFindBoundaries().toList { it.symbol }
 
@@ -203,16 +202,16 @@ class TypeDisambiguationTest : ParserTestSpec({
         """)
 
         val (m0, m1, m2, m3, m4, m5, s0, s1, s2) =
-                acu.descendants(ASTFieldDeclaration::class.java).map { it.typeNode as ASTClassOrInterfaceType }.toList()
+                acu.descendants(ASTFieldDeclaration::class.java).map { it.typeNode as ASTClassType }.toList()
 
-        fun assertErrored(t: ASTClassOrInterfaceType, expected: Int, actual: Int) {
+        fun assertErrored(t: ASTClassType, expected: Int, actual: Int) {
             val errs = logger.warnings[MALFORMED_GENERIC_TYPE]?.filter { it.first == t }
                     ?: emptyList()
             assertEquals(errs.size, 1, "`${t.text}` should have produced a single error")
             errs.single().second.toList() shouldBe listOf(expected, actual)
         }
 
-        fun assertNoError(t: ASTClassOrInterfaceType) {
+        fun assertNoError(t: ASTClassType) {
             val err = logger.warnings[MALFORMED_GENERIC_TYPE]?.firstOrNull { it.first == t }
             assertNull(err, "`${t.text}` should not have produced an error")
         }
@@ -243,7 +242,7 @@ class TypeDisambiguationTest : ParserTestSpec({
         """)
 
         val (m0) =
-                acu.descendants(ASTFieldDeclaration::class.java).map { it.typeNode as ASTClassOrInterfaceType }.toList()
+                acu.descendants(ASTFieldDeclaration::class.java).map { it.typeNode as ASTClassType }.toList()
 
         val outerUnresolved = m0.qualifier!!
         val outerT = outerUnresolved.typeMirror.shouldBeA {
@@ -287,14 +286,14 @@ class TypeDisambiguationTest : ParserTestSpec({
         val (aT, aC, aI, aUnresolved, aOk) =
                 acu.descendants(ASTAnnotation::class.java).map { it.typeNode }.toList()
 
-        fun assertErrored(t: ASTClassOrInterfaceType) {
+        fun assertErrored(t: ASTClassType) {
             val errs = logger.warnings[EXPECTED_ANNOTATION_TYPE]?.filter { it.first == t }
                     ?: emptyList()
             assertEquals(errs.size, 1, "`${t.text}` should have produced a single error")
             errs.single().second.toList() shouldBe emptyList()
         }
 
-        fun assertNoError(t: ASTClassOrInterfaceType) {
+        fun assertNoError(t: ASTClassType) {
             val err = logger.warnings[MALFORMED_GENERIC_TYPE]?.firstOrNull { it.first == t }
             assertNull(err, "`${t.text}` should not have produced an error")
         }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/LocalTypeScopesTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/LocalTypeScopesTest.kt
index 834ebbf720..d0f1bc91ab 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/LocalTypeScopesTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/LocalTypeScopesTest.kt
@@ -5,11 +5,8 @@
 package net.sourceforge.pmd.lang.java.symbols.table.internal
 
 import io.kotest.matchers.shouldBe
-import net.sourceforge.pmd.lang.ast.test.component6
-import net.sourceforge.pmd.lang.ast.test.component7
 import net.sourceforge.pmd.lang.ast.test.shouldBe
 import net.sourceforge.pmd.lang.java.ast.*
-import net.sourceforge.pmd.lang.java.symbols.JClassSymbol
 import net.sourceforge.pmd.lang.java.types.JClassType
 import net.sourceforge.pmd.lang.java.types.shouldHaveType
 import net.sourceforge.pmd.lang.java.types.typeDsl
@@ -178,7 +175,7 @@ class LocalTypeScopesTest : ParserTestSpec({
 
 
         val (n2, mapEntry, kkEntry, n2i2, i4) =
-                acu.descendants(ASTClassOrInterfaceType::class.java).toList()
+                acu.descendants(ASTClassType::class.java).toList()
 
         val (_, cKK, cKkEntry, cN2, cN2i2) =
                 acu.descendants(ASTAnyTypeDeclaration::class.java).toList { it.typeMirror }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/MemberInheritanceTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/MemberInheritanceTest.kt
index 233f4cc299..6277d07ec9 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/MemberInheritanceTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/MemberInheritanceTest.kt
@@ -276,7 +276,7 @@ class MemberInheritanceTest : ParserTestSpec({
             it.shouldBe(`t_Scratch{String}Inner`)
         }
 
-        val typeNode = acu.descendants(ASTClassOrInterfaceType::class.java).first { it.simpleName == "Inner" }!!
+        val typeNode = acu.descendants(ASTClassType::class.java).first { it.simpleName == "Inner" }!!
 
         typeNode.shouldMatchN {
             classType("Inner") {
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/TypeParamScopingTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/TypeParamScopingTest.kt
index 1e38b89045..94960891c0 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/TypeParamScopingTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/TypeParamScopingTest.kt
@@ -9,8 +9,6 @@ import io.kotest.matchers.types.shouldBeSameInstanceAs
 import net.sourceforge.pmd.lang.ast.test.shouldBe
 import net.sourceforge.pmd.lang.ast.test.shouldBeA
 import net.sourceforge.pmd.lang.java.ast.*
-import net.sourceforge.pmd.lang.java.symbols.JClassSymbol
-import net.sourceforge.pmd.lang.java.symbols.JTypeParameterSymbol
 import net.sourceforge.pmd.lang.java.types.JClassType
 import net.sourceforge.pmd.lang.java.types.JTypeVar
 
@@ -89,7 +87,7 @@ class TypeParamScopingTest : ParserTestSpec({
 
             val (t, x) = acu.descendants(ASTTypeParameter::class.java).toList()
 
-            t.typeBoundNode.shouldBeA {
+            t.typeBoundNode.shouldBeA {
                 it.symbolTable.shouldResolveTypeTo("X", x.typeMirror)
             }
         }
@@ -106,7 +104,7 @@ class TypeParamScopingTest : ParserTestSpec({
 
             val (x, t) = acu.descendants(ASTTypeParameter::class.java).toList()
 
-            t.typeBoundNode.shouldBeA {
+            t.typeBoundNode.shouldBeA {
                 it.symbolTable.shouldResolveTypeTo("X", x.typeMirror)
             }
         }
@@ -123,7 +121,7 @@ class TypeParamScopingTest : ParserTestSpec({
 
             val (t) = acu.descendants(ASTTypeParameter::class.java).toList()
 
-            t.typeBoundNode.shouldBeA {
+            t.typeBoundNode.shouldBeA {
                 it.symbolTable.shouldResolveTypeTo("T", t.typeMirror)
             }
         }
@@ -170,7 +168,7 @@ class TypeParamScopingTest : ParserTestSpec({
 
         doTest("TParams of class are in scope inside method tparam declaration") {
 
-            t2.typeBoundNode.shouldBeA {
+            t2.typeBoundNode.shouldBeA {
                 it.symbolTable.shouldResolveTypeTo("X", x.typeMirror)
             }
 
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/SubstTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/SubstTest.kt
index d41de8f08a..484e4d425d 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/SubstTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/SubstTest.kt
@@ -11,7 +11,7 @@ import io.kotest.matchers.maps.shouldContainExactly
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration
-import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType
+import net.sourceforge.pmd.lang.java.ast.ASTClassType
 import net.sourceforge.pmd.lang.java.ast.ProcessorTestSpec
 
 class SubstTest : ProcessorTestSpec({
@@ -38,7 +38,7 @@ class SubstTest : ProcessorTestSpec({
         val (k, f, c) = typeDecl.typeMirror.formalTypeParams
 
 
-        val fieldT = typeDecl.descendants(ASTClassOrInterfaceType::class.java).drop(2).firstOrThrow()
+        val fieldT = typeDecl.descendants(ASTClassType::class.java).drop(2).firstOrThrow()
         
         val map = Map::class
 
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt
index ac4842b69c..9c2b3e147d 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt
@@ -7,8 +7,6 @@
 package net.sourceforge.pmd.lang.java.types.internal.infer
 
 import io.kotest.matchers.shouldBe
-import io.kotest.matchers.string.shouldBeEmpty
-import io.kotest.matchers.string.shouldNotContainIgnoringCase
 import net.sourceforge.pmd.lang.ast.test.shouldBeA
 import net.sourceforge.pmd.lang.ast.test.shouldMatchN
 import net.sourceforge.pmd.lang.java.ast.*
@@ -168,7 +166,7 @@ class C {
         )
 
 
-        val t_UnresolvedOfString = acu.descendants(ASTClassOrInterfaceType::class.java)
+        val t_UnresolvedOfString = acu.descendants(ASTClassType::class.java)
                 .first { it.simpleName == "Unresolved" }!!.typeMirror.shouldBeA {
                     it.isParameterizedType shouldBe true
                     it.typeArgs shouldBe listOf(it.typeSystem.STRING)
@@ -300,7 +298,7 @@ class C {
 
 
         val (foo1) = acu.descendants(ASTMethodDeclaration::class.java).toList { it.symbol }
-        val (t_U1, t_U2) = acu.descendants(ASTClassOrInterfaceType::class.java).toList { it.typeMirror }
+        val (t_U1, t_U2) = acu.descendants(ASTClassType::class.java).toList { it.typeMirror }
 
         t_U1.shouldBeUnresolvedClass("U1")
         t_U2.shouldBeUnresolvedClass("U2")
@@ -341,7 +339,7 @@ class C extends U1 {
 
 
         val (foo1) = acu.descendants(ASTMethodDeclaration::class.java).toList { it.symbol }
-        val (t_U1) = acu.descendants(ASTClassOrInterfaceType::class.java).toList { it.typeMirror }
+        val (t_U1) = acu.descendants(ASTClassType::class.java).toList { it.typeMirror }
 
         t_U1.shouldBeUnresolvedClass("U1")
 
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/Bug1429.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/Bug1429.txt
index 71d0ab94e6..c9cbf0507b 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/Bug1429.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/Bug1429.txt
@@ -4,16 +4,16 @@
       +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "getAttributeTuples", @Name = "getAttributeTuples", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
             +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-            +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Set"]
+            +- ClassType[@FullyQualified = false, @SimpleName = "Set"]
             |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             +- FormalParameters[@Empty = true, @Size = 0]
             +- Block[@Empty = false, @Size = 1, @containsComment = false]
                +- ReturnStatement[]
                   +- CastExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Set"]
+                     +- ClassType[@FullyQualified = false, @SimpleName = "Set"]
                      |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                      +- ConditionalExpression[@CompileTimeConstant = false, @ParenthesisDepth = 1, @Parenthesized = true]
                         +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
                         |  +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "attributes", @Name = "attributes", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -22,12 +22,12 @@
                         +- MethodCall[@CompileTimeConstant = false, @Image = "emptySet", @MethodName = "emptySet", @ParenthesisDepth = 0, @Parenthesized = false]
                         |  +- AmbiguousName[@CompileTimeConstant = false, @Image = "Collections", @Name = "Collections", @ParenthesisDepth = 0, @Parenthesized = false]
                         |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                        |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                        |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                         |  +- ArgumentList[@Empty = true, @Size = 0]
                         +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-                           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "HashSet"]
+                           +- ClassType[@FullyQualified = false, @SimpleName = "HashSet"]
                            |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                           |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                            +- ArgumentList[@Empty = false, @Size = 1]
                               +- MethodCall[@CompileTimeConstant = false, @Image = "collect", @MethodName = "collect", @ParenthesisDepth = 0, @Parenthesized = false]
                                  +- AmbiguousName[@CompileTimeConstant = false, @Image = "CollectionUtils", @Name = "CollectionUtils", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -37,7 +37,7 @@
                                     |  |  +- ThisExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
                                     |  +- ArgumentList[@Empty = true, @Size = 0]
                                     +- ConstructorCall[@AnonymousClass = true, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-                                       +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Transformer"]
+                                       +- ClassType[@FullyQualified = false, @SimpleName = "Transformer"]
                                        +- ArgumentList[@Empty = true, @Size = 0]
                                        +- AnonymousClassDeclaration[@Abstract = false, @Annotation = false, @Anonymous = true, @BinaryName = "Bug1429$1", @CanonicalName = null, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "", @Static = false, @TopLevel = false, @Visibility = Visibility.V_ANONYMOUS]
                                           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -45,36 +45,36 @@
                                              +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Final = false, @Image = "transform", @Name = "transform", @Overridden = true, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
                                                 +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
                                                 |  +- Annotation[@SimpleName = "Override"]
-                                                |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Override"]
-                                                +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+                                                |     +- ClassType[@FullyQualified = false, @SimpleName = "Override"]
+                                                +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                                                 +- FormalParameters[@Empty = false, @Size = 1]
                                                 |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = true, @Varargs = false, @Visibility = Visibility.V_LOCAL]
                                                 |     +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
-                                                |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+                                                |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                                                 |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                                                 +- Block[@Empty = false, @Size = 5, @containsComment = false]
                                                    +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = true, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                                                    |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
-                                                   |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                                                   |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                                                    |  +- VariableDeclarator[@Initializer = true, @Name = "key"]
                                                    |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "key", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                                                    |     +- CastExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                                                   |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                                                   |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                                                    |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "obj", @Name = "obj", @ParenthesisDepth = 0, @Parenthesized = false]
                                                    +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = true, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                                                    |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
-                                                   |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                                                   |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                                                    |  +- VariableDeclarator[@Initializer = true, @Name = "value"]
                                                    |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "value", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                                                    |     +- MethodCall[@CompileTimeConstant = false, @Image = "get", @MethodName = "get", @ParenthesisDepth = 0, @Parenthesized = false]
                                                    |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "attributes", @Name = "attributes", @ParenthesisDepth = 0, @Parenthesized = false]
                                                    |        |  +- ThisExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                                                   |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "HGXLIFFTypeConfiguration"]
+                                                   |        |     +- ClassType[@FullyQualified = false, @SimpleName = "HGXLIFFTypeConfiguration"]
                                                    |        +- ArgumentList[@Empty = false, @Size = 1]
                                                    |           +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "key", @Name = "key", @ParenthesisDepth = 0, @Parenthesized = false]
                                                    +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                                                    |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                                                   |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                                                   |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                                                    |  +- VariableDeclarator[@Initializer = true, @Name = "result"]
                                                    |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "result", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                                                    |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "key", @Name = "key", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/Bug1530.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/Bug1530.txt
index 46acee70f1..d5ce2cf776 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/Bug1530.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/Bug1530.txt
@@ -11,7 +11,7 @@
                   +- UnaryExpression[@CompileTimeConstant = false, @Operator = UnaryOp.POST_INCREMENT, @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "currentChild", @Name = "currentChild", @ParenthesisDepth = 0, @Parenthesized = false]
                         +- CastExpression[@CompileTimeConstant = false, @ParenthesisDepth = 1, @Parenthesized = true]
-                           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "PathElement"]
+                           +- ClassType[@FullyQualified = false, @SimpleName = "PathElement"]
                            +- MethodCall[@CompileTimeConstant = false, @Image = "getUserObject", @MethodName = "getUserObject", @ParenthesisDepth = 0, @Parenthesized = false]
                               +- MethodCall[@CompileTimeConstant = false, @Image = "getLastLeaf", @MethodName = "getLastLeaf", @ParenthesisDepth = 0, @Parenthesized = false]
                               |  +- AmbiguousName[@CompileTimeConstant = false, @Image = "stack", @Name = "stack", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug207.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug207.txt
index ed1c7fa24f..efac216c9d 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug207.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug207.txt
@@ -4,13 +4,13 @@
       +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PRIVATE, @Final = false, @Image = "resourceHttpMessageWriter", @Name = "resourceHttpMessageWriter", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PRIVATE, @Void = false]
             +- ModifierList[@EffectiveModifiers = "{private, static}", @ExplicitModifiers = "{private, static}"]
-            +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "HttpMessageWriter"]
+            +- ClassType[@FullyQualified = false, @SimpleName = "HttpMessageWriter"]
             |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Resource"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "Resource"]
             +- FormalParameters[@Empty = false, @Size = 1]
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-            |     +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Context"]
+            |     +- ClassType[@FullyQualified = true, @SimpleName = "Context"]
             |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "context", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 1, @containsComment = false]
                +- ReturnStatement[]
@@ -20,4 +20,4 @@
                         +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = false, @MethodName = "cast", @ParenthesisDepth = 0, @Parenthesized = false]
                            +- AmbiguousName[@CompileTimeConstant = false, @Image = "BodyInserters", @Name = "BodyInserters", @ParenthesisDepth = 0, @Parenthesized = false]
                            +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Resource"]
+                              +- ClassType[@FullyQualified = false, @SimpleName = "Resource"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug208.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug208.txt
index 2c4b98292c..68fe589ed4 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug208.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug208.txt
@@ -11,15 +11,15 @@
                   +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "GitHubBug208$1LocalClass", @CanonicalName = null, @EffectiveVisibility = Visibility.V_LOCAL, @Enum = false, @Final = false, @Interface = false, @Local = true, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "LocalClass", @Static = false, @TopLevel = false, @Visibility = Visibility.V_LOCAL]
                      +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
                      |  +- Annotation[@SimpleName = "Lazy"]
-                     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Lazy"]
+                     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Lazy"]
                      |  +- Annotation[@SimpleName = "Configuration"]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Configuration"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "Configuration"]
                      +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
                         +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Image = "foo", @Name = "foo", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
                            +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
                            |  +- Annotation[@SimpleName = "Bean"]
-                           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Bean"]
-                           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+                           |     +- ClassType[@FullyQualified = false, @SimpleName = "Bean"]
+                           +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                            +- FormalParameters[@Empty = true, @Size = 0]
                            +- Block[@Empty = false, @Size = 1, @containsComment = false]
                               +- ReturnStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug309.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug309.txt
index 23846bc1f3..43fac5d4ba 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug309.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug309.txt
@@ -10,24 +10,24 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 2, @containsComment = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "r11"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r11", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = true, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false]
                |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Main"]
+               |        |  +- ClassType[@FullyQualified = false, @SimpleName = "Main"]
                |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IntFunction"]
+                  +- ClassType[@FullyQualified = false, @SimpleName = "IntFunction"]
                   |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
                   |     +- ArrayType[@ArrayDepth = 1]
                   |        +- PrimitiveType[@Kind = PrimitiveTypeKind.INT]
@@ -42,4 +42,4 @@
                         |     +- ArrayDimensions[@Empty = false, @Size = 1]
                         |        +- ArrayTypeDim[@Varargs = false]
                         +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug3642.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug3642.txt
index ed67df15dd..ff83a2022a 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug3642.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug3642.txt
@@ -7,7 +7,7 @@
             +- AnnotationTypeBody[@Empty = false, @Size = 1]
                +- MethodDeclaration[@Abstract = true, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "v1", @Name = "v1", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
                   +- ModifierList[@EffectiveModifiers = "{public, abstract}", @ExplicitModifiers = "{}"]
-                  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                   +- FormalParameters[@Empty = true, @Size = 0]
                   +- ArrayDimensions[@Empty = false, @Size = 1]
                      +- ArrayTypeDim[@Varargs = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1333.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1333.txt
index 31621853ef..5588be5bab 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1333.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1333.txt
@@ -4,14 +4,14 @@
       +- ClassOrInterfaceBody[@Empty = false, @Size = 4]
          +- FieldDeclaration[@EffectiveVisibility = Visibility.V_PRIVATE, @Static = true, @Visibility = Visibility.V_PRIVATE]
          |  +- ModifierList[@EffectiveModifiers = "{private, static, final}", @ExplicitModifiers = "{private, static, final}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Logger"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "Logger"]
          |  +- VariableDeclarator[@Initializer = true, @Name = "LOG"]
          |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = true, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "LOG", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |     +- MethodCall[@CompileTimeConstant = false, @Image = "getLogger", @MethodName = "getLogger", @ParenthesisDepth = 0, @Parenthesized = false]
          |        +- AmbiguousName[@CompileTimeConstant = false, @Image = "LoggerFactory", @Name = "LoggerFactory", @ParenthesisDepth = 0, @Parenthesized = false]
          |        +- ArgumentList[@Empty = false, @Size = 1]
          |           +- ClassLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Foo"]
+         |              +- ClassType[@FullyQualified = false, @SimpleName = "Foo"]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "deleteDirectoriesByNamePattern", @Name = "deleteDirectoriesByNamePattern", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
          |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
          |  +- VoidType[]
@@ -34,10 +34,10 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Consumer"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Consumer"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
          |  |     |     +- WildcardType[@LowerBound = true, @UpperBound = false]
-         |  |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "consumer", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ExpressionStatement[]
@@ -53,7 +53,7 @@
             +- FormalParameters[@Empty = false, @Size = 1]
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "path", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 1, @containsComment = false]
                +- ExpressionStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1470.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1470.txt
index bb726be66b..0ac3fcca08 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1470.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1470.txt
@@ -13,25 +13,25 @@
          |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = true, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "stuff", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "testSuper", @Name = "testSuper", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Observable"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "Observable"]
          |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Boolean"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Boolean"]
          |  +- FormalParameters[@Empty = true, @Size = 0]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ReturnStatement[]
          |        +- MethodCall[@CompileTimeConstant = false, @Image = "map", @MethodName = "map", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "create", @MethodName = "create", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Observable"]
+         |           |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Observable"]
          |           |  +- ArgumentList[@Empty = false, @Size = 1]
          |           |     +- LambdaExpression[@Arity = 1, @BlockBody = true, @CompileTimeConstant = false, @ExpressionBody = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |           |        +- LambdaParameterList[@Empty = false, @Size = 1]
          |           |        |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
          |           |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Subscriber"]
+         |           |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Subscriber"]
          |           |        |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
          |           |        |     |     +- WildcardType[@LowerBound = true, @UpperBound = false]
-         |           |        |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |        |     |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "subscriber", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
          |           |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           |           +- ExpressionStatement[]
@@ -47,16 +47,16 @@
          |                 +- BooleanLiteral[@CompileTimeConstant = true, @ParenthesisDepth = 0, @Parenthesized = false, @True = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "testSuper2", @Name = "testSuper2", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
             +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-            +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Observable"]
+            +- ClassType[@FullyQualified = false, @SimpleName = "Observable"]
             |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Boolean"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "Boolean"]
             +- FormalParameters[@Empty = true, @Size = 0]
             +- Block[@Empty = false, @Size = 1, @containsComment = false]
                +- ReturnStatement[]
                   +- MethodCall[@CompileTimeConstant = false, @Image = "map", @MethodName = "map", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- MethodCall[@CompileTimeConstant = false, @Image = "create", @MethodName = "create", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Observable"]
+                     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Observable"]
                      |  +- ArgumentList[@Empty = false, @Size = 1]
                      |     +- LambdaExpression[@Arity = 1, @BlockBody = true, @CompileTimeConstant = false, @ExpressionBody = false, @ParenthesisDepth = 0, @Parenthesized = false]
                      |        +- LambdaParameterList[@Empty = false, @Size = 1]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug206.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug206.txt
index a610380aed..6bc6462bac 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug206.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug206.txt
@@ -4,16 +4,16 @@
       +- AnnotationTypeBody[@Empty = false, @Size = 1]
          +- FieldDeclaration[@EffectiveVisibility = Visibility.V_PUBLIC, @Static = true, @Visibility = Visibility.V_PUBLIC]
             +- ModifierList[@EffectiveModifiers = "{public, static, final}", @ExplicitModifiers = "{static, final}"]
-            +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ThreadLocal"]
+            +- ClassType[@FullyQualified = false, @SimpleName = "ThreadLocal"]
             |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Interner"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "Interner"]
             |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+            |           +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
             +- VariableDeclarator[@Initializer = true, @Name = "interner"]
                +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PUBLIC, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = true, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "interner", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PUBLIC]
                +- MethodCall[@CompileTimeConstant = false, @Image = "withInitial", @MethodName = "withInitial", @ParenthesisDepth = 0, @Parenthesized = false]
                   +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ThreadLocal"]
+                  |  +- ClassType[@FullyQualified = false, @SimpleName = "ThreadLocal"]
                   +- ArgumentList[@Empty = false, @Size = 1]
                      +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = false, @MethodName = "newStrongInterner", @ParenthesisDepth = 0, @Parenthesized = false]
                         +- AmbiguousName[@CompileTimeConstant = false, @Image = "Interners", @Name = "Interners", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases.txt
index 9ba52c3723..4bf0237aea 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases.txt
@@ -13,20 +13,20 @@
    |     |  +- FormalParameters[@Empty = false, @Size = 1]
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Class"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Class"]
    |     |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "V"]
+   |     |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "V"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "clazz", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "doStuff", @Name = "doStuff", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
    |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |        +- TypeParameters[@Empty = false, @Size = 1]
    |        |  +- TypeParameter[@Image = "T", @Name = "T", @TypeBound = false]
-   |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+   |        +- ClassType[@FullyQualified = false, @SimpleName = "T"]
    |        +- FormalParameters[@Empty = false, @Size = 1]
    |        |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+   |        |     +- ClassType[@FullyQualified = false, @SimpleName = "T"]
    |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |           +- ReturnStatement[]
@@ -42,7 +42,7 @@
    |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |           +- ArgumentList[@Empty = false, @Size = 1]
    |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Outer constructor", @Empty = false, @Image = "\"Outer constructor\"", @Length = 17, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Outer$Inner", @CanonicalName = "Outer.Inner", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Inner", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -56,21 +56,21 @@
    |                    +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |                       +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |                       |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |                       |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |                       |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |                       +- ArgumentList[@Empty = false, @Size = 1]
    |                          +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Inner constructor", @Empty = false, @Image = "\"Inner constructor\"", @Length = 17, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Child", @CanonicalName = "Child", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Child", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PACKAGE]
    |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |  +- ExtendsList[@Empty = false, @Size = 1]
-   |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Inner"]
-   |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Outer"]
+   |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Inner"]
+   |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Outer"]
    |  +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
    |     +- ConstructorDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Image = "Child", @Name = "Child", @Varargs = false, @Visibility = Visibility.V_PACKAGE, @containsComment = false]
    |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |        +- FormalParameters[@Empty = false, @Size = 1]
    |        |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Outer"]
+   |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Outer"]
    |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |        +- Block[@Empty = false, @Size = 2, @containsComment = false]
    |           +- ExplicitConstructorInvocation[@ArgumentCount = 0, @MethodName = "new", @Qualified = true, @Super = true, @This = false]
@@ -80,13 +80,13 @@
    |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |                 +- ArgumentList[@Empty = false, @Size = 1]
    |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Child constructor", @Empty = false, @Image = "\"Child constructor\"", @Length = 17, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ParserCornerCases", @CanonicalName = "ParserCornerCases", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "ParserCornerCases", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PUBLIC]
    |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
    |  +- ExtendsList[@Empty = false, @Size = 1]
-   |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Superclass"]
+   |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Superclass"]
    |  +- ClassOrInterfaceBody[@Empty = false, @Size = 8]
    |     +- ConstructorDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Image = "ParserCornerCases", @Name = "ParserCornerCases", @Varargs = false, @Visibility = Visibility.V_PUBLIC, @containsComment = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
@@ -104,7 +104,7 @@
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ExplicitConstructorInvocation[@ArgumentCount = 2, @MethodName = "new", @Qualified = false, @Super = false, @This = true]
    |     |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
    |     |        +- ArgumentList[@Empty = false, @Size = 2]
    |     |           +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "a", @Name = "a", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
@@ -124,16 +124,16 @@
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ExplicitConstructorInvocation[@ArgumentCount = 1, @MethodName = "new", @Qualified = false, @Super = true, @This = false]
    |     |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |        +- ArgumentList[@Empty = false, @Size = 1]
    |     |           +- ClassLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |              +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     +- ConstructorDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Image = "ParserCornerCases", @Name = "ParserCornerCases", @Varargs = false, @Visibility = Visibility.V_PUBLIC, @containsComment = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
    |     |  +- FormalParameters[@Empty = false, @Size = 1]
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "title", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ExplicitConstructorInvocation[@ArgumentCount = 0, @MethodName = "new", @Qualified = false, @Super = false, @This = true]
@@ -145,42 +145,42 @@
    |     |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "o"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- MethodCall[@CompileTimeConstant = false, @Image = "doStuff", @MethodName = "doStuff", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- SuperExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |        +- ArgumentList[@Empty = false, @Size = 1]
    |     |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "foo", @Empty = false, @Image = "\"foo\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |        +- VariableDeclarator[@Initializer = true, @Name = "v"]
    |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "v", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |           +- MethodCall[@CompileTimeConstant = false, @Image = "thisGeneric", @MethodName = "thisGeneric", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |              +- ThisExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |              +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |              |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |              |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |              +- ArgumentList[@Empty = false, @Size = 1]
    |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "bar", @Empty = false, @Image = "\"bar\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "thisGeneric", @Name = "thisGeneric", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |     |  +- TypeParameters[@Empty = false, @Size = 1]
    |     |  |  +- TypeParameter[@Image = "X", @Name = "X", @TypeBound = false]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "X"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "X"]
    |     |  +- FormalParameters[@Empty = false, @Size = 1]
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "X"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "X"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
    |     |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x", @Name = "x", @ParenthesisDepth = 0, @Parenthesized = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "getByteArrayClass", @Name = "getByteArrayClass", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Class"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Class"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -215,13 +215,13 @@
    |        +- FormalParameters[@Empty = false, @Size = 1]
    |        |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |        +- Block[@Empty = true, @Size = 0, @containsComment = false]
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "PmdTestChild", @CanonicalName = "PmdTestChild", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "PmdTestChild", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PACKAGE]
    |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |  +- ExtendsList[@Empty = false, @Size = 1]
-   |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "PmdTestParent"]
+   |  |  +- ClassType[@FullyQualified = false, @SimpleName = "PmdTestParent"]
    |  +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
    |     +- ConstructorDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Image = "PmdTestChild", @Name = "PmdTestChild", @Varargs = false, @Visibility = Visibility.V_PUBLIC, @containsComment = false]
    |        +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
@@ -230,19 +230,19 @@
    |           +- ExplicitConstructorInvocation[@ArgumentCount = 1, @MethodName = "new", @Qualified = false, @Super = true, @This = false]
    |              +- ArgumentList[@Empty = false, @Size = 1]
    |                 +- ConstructorCall[@AnonymousClass = true, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |                    +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |                    +- ArgumentList[@Empty = true, @Size = 0]
    |                    +- AnonymousClassDeclaration[@Abstract = false, @Annotation = false, @Anonymous = true, @BinaryName = "PmdTestChild$1", @CanonicalName = null, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "", @Static = false, @TopLevel = false, @Visibility = Visibility.V_ANONYMOUS]
    |                       +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |                       +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
    |                          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Final = false, @Image = "create", @Name = "create", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |                             +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-   |                             +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |                             +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |                             +- FormalParameters[@Empty = true, @Size = 0]
    |                             +- Block[@Empty = false, @Size = 3, @containsComment = false]
    |                                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |                                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |                                |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |                                |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |                                |  +- VariableDeclarator[@Initializer = true, @Name = "memoryMonitor"]
    |                                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "memoryMonitor", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |                                |     +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -255,7 +255,7 @@
    |                                |        +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
    |                                |           +- VariableAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "memoryMonitor", @Name = "memoryMonitor", @ParenthesisDepth = 0, @Parenthesized = false]
    |                                |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |                                |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |                                |              +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |                                |              +- ArgumentList[@Empty = true, @Size = 0]
    |                                +- ReturnStatement[]
    |                                   +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "memoryMonitor", @Name = "memoryMonitor", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -264,7 +264,7 @@
    |  +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
    |     +- FieldDeclaration[@EffectiveVisibility = Visibility.V_PACKAGE, @Static = false, @Visibility = Visibility.V_PACKAGE]
    |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |        +- VariableDeclarator[@Initializer = false, @Name = "name"]
    |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = true, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "name", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "SimpleBeanUser", @CanonicalName = "SimpleBeanUser", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "SimpleBeanUser", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PACKAGE]
@@ -275,7 +275,7 @@
    |     |  +- FormalParameters[@Empty = false, @Size = 1]
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SimpleBean"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "SimpleBean"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
    |     +- ConstructorDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Image = "SimpleBeanUser", @Name = "SimpleBeanUser", @Varargs = false, @Visibility = Visibility.V_PACKAGE, @containsComment = false]
@@ -285,7 +285,7 @@
    |           +- ExplicitConstructorInvocation[@ArgumentCount = 1, @MethodName = "new", @Qualified = false, @Super = false, @This = true]
    |              +- ArgumentList[@Empty = false, @Size = 1]
    |                 +- ConstructorCall[@AnonymousClass = true, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SimpleBean"]
+   |                    +- ClassType[@FullyQualified = false, @SimpleName = "SimpleBean"]
    |                    +- ArgumentList[@Empty = true, @Size = 0]
    |                    +- AnonymousClassDeclaration[@Abstract = false, @Annotation = false, @Anonymous = true, @BinaryName = "SimpleBeanUser$1", @CanonicalName = null, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "", @Static = false, @TopLevel = false, @Visibility = Visibility.V_ANONYMOUS]
    |                       +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -299,7 +299,7 @@
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "SimpleBeanUser2", @CanonicalName = "SimpleBeanUser2", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "SimpleBeanUser2", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PACKAGE]
    |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |  +- ExtendsList[@Empty = false, @Size = 1]
-   |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SimpleBeanUser"]
+   |  |  +- ClassType[@FullyQualified = false, @SimpleName = "SimpleBeanUser"]
    |  +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
    |     +- ConstructorDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Image = "SimpleBeanUser2", @Name = "SimpleBeanUser2", @Varargs = false, @Visibility = Visibility.V_PACKAGE, @containsComment = false]
    |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -308,7 +308,7 @@
    |           +- ExplicitConstructorInvocation[@ArgumentCount = 1, @MethodName = "new", @Qualified = false, @Super = true, @This = false]
    |              +- ArgumentList[@Empty = false, @Size = 1]
    |                 +- ConstructorCall[@AnonymousClass = true, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SimpleBean"]
+   |                    +- ClassType[@FullyQualified = false, @SimpleName = "SimpleBean"]
    |                    +- ArgumentList[@Empty = true, @Size = 0]
    |                    +- AnonymousClassDeclaration[@Abstract = false, @Annotation = false, @Anonymous = true, @BinaryName = "SimpleBeanUser2$1", @CanonicalName = null, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "", @Static = false, @TopLevel = false, @Visibility = Visibility.V_ANONYMOUS]
    |                       +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -332,7 +332,7 @@
    |           |  |  +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |           |  |     |  +- Annotation[@SimpleName = "SuppressWarnings"]
-   |           |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SuppressWarnings"]
+   |           |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "SuppressWarnings"]
    |           |  |     |     +- AnnotationMemberList[@Empty = false, @Size = 1]
    |           |  |     |        +- MemberValuePair[@Image = "value", @Name = "value", @Shorthand = true]
    |           |  |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "unchecked", @Empty = false, @Image = "\"unchecked\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -353,11 +353,11 @@
    |           |  |  +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |           |  |     |  +- Annotation[@SimpleName = "SuppressWarnings"]
-   |           |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SuppressWarnings"]
+   |           |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "SuppressWarnings"]
    |           |  |     |     +- AnnotationMemberList[@Empty = false, @Size = 1]
    |           |  |     |        +- MemberValuePair[@Image = "value", @Name = "value", @Shorthand = true]
    |           |  |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "unchecked", @Empty = false, @Image = "\"unchecked\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
-   |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Iterator"]
+   |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Iterator"]
    |           |  |     +- VariableDeclarator[@Initializer = true, @Name = "it"]
    |           |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = true, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "it", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |           |  |        +- MethodCall[@CompileTimeConstant = false, @Image = "iterator", @MethodName = "iterator", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -371,25 +371,25 @@
    |           |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
    |           +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+   |           |  +- ClassType[@FullyQualified = false, @SimpleName = "List"]
    |           |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |           |  +- VariableDeclarator[@Initializer = true, @Name = "l"]
    |           |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "l", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |           |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ArrayList"]
+   |           |        +- ClassType[@FullyQualified = false, @SimpleName = "ArrayList"]
    |           |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |           |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |           |        |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |           |        +- ArgumentList[@Empty = true, @Size = 0]
    |           +- ForeachStatement[]
    |              +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |              |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |              |  |  +- Annotation[@SimpleName = "SuppressWarnings"]
-   |              |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SuppressWarnings"]
+   |              |  |     +- ClassType[@FullyQualified = false, @SimpleName = "SuppressWarnings"]
    |              |  |     +- AnnotationMemberList[@Empty = false, @Size = 1]
    |              |  |        +- MemberValuePair[@Image = "value", @Name = "value", @Shorthand = true]
    |              |  |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "unchecked", @Empty = false, @Image = "\"unchecked\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
-   |              |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |              |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |              |  +- VariableDeclarator[@Initializer = false, @Name = "s"]
    |              |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = true, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "l", @Name = "l", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -405,13 +405,13 @@
    |        +- FormalParameters[@Empty = false, @Size = 1]
    |        |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FooBlock"]
+   |        |     +- ClassType[@FullyQualified = false, @SimpleName = "FooBlock"]
    |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "b", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |        +- Block[@Empty = true, @Size = 0, @containsComment = false]
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Foo", @CanonicalName = "Foo", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Foo", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PACKAGE]
    |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |  +- ExtendsList[@Empty = false, @Size = 1]
-   |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyFoo"]
+   |  |  +- ClassType[@FullyQualified = false, @SimpleName = "MyFoo"]
    |  +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
    |     +- ConstructorDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Image = "Foo", @Name = "Foo", @Varargs = false, @Visibility = Visibility.V_PUBLIC, @containsComment = false]
    |        +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
@@ -420,23 +420,23 @@
    |           +- ExplicitConstructorInvocation[@ArgumentCount = 1, @MethodName = "new", @Qualified = false, @Super = true, @This = false]
    |              +- ArgumentList[@Empty = false, @Size = 1]
    |                 +- ConstructorCall[@AnonymousClass = true, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FooBlock"]
+   |                    +- ClassType[@FullyQualified = false, @SimpleName = "FooBlock"]
    |                    +- ArgumentList[@Empty = true, @Size = 0]
    |                    +- AnonymousClassDeclaration[@Abstract = false, @Annotation = false, @Anonymous = true, @BinaryName = "Foo$1", @CanonicalName = null, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "", @Static = false, @TopLevel = false, @Visibility = Visibility.V_ANONYMOUS]
    |                       +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |                       +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
    |                          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Final = false, @Image = "valueOf", @Name = "valueOf", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |                             +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-   |                             +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |                             +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |                             +- FormalParameters[@Empty = false, @Size = 1]
    |                             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |                             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |                             |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |                             |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |                             |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "object", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |                             +- Block[@Empty = false, @Size = 2, @containsComment = false]
    |                                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |                                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |                                |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |                                |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |                                |  +- VariableDeclarator[@Initializer = true, @Name = "fish"]
    |                                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "fish", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |                                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "salmon", @Empty = false, @Image = "\"salmon\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -447,9 +447,9 @@
    |  +- ClassOrInterfaceBody[@Empty = false, @Size = 1]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "iterator", @Name = "iterator", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |        +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-   |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Iterator"]
+   |        +- ClassType[@FullyQualified = false, @SimpleName = "Iterator"]
    |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "E"]
+   |        |     +- ClassType[@FullyQualified = false, @SimpleName = "E"]
    |        +- FormalParameters[@Empty = true, @Size = 0]
    |        +- Block[@Empty = false, @Size = 2, @containsComment = false]
    |           +- IfStatement[@Else = false]
@@ -462,23 +462,23 @@
    |           |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |           |     +- ReturnStatement[]
    |           |        +- ConstructorCall[@AnonymousClass = true, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |           |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Iterator"]
+   |           |           +- ClassType[@FullyQualified = false, @SimpleName = "Iterator"]
    |           |           |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |           |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "E"]
+   |           |           |     +- ClassType[@FullyQualified = false, @SimpleName = "E"]
    |           |           +- ArgumentList[@Empty = true, @Size = 0]
    |           |           +- AnonymousClassDeclaration[@Abstract = false, @Annotation = false, @Anonymous = true, @BinaryName = "SuperTest$1", @CanonicalName = null, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "", @Static = false, @TopLevel = false, @Visibility = Visibility.V_ANONYMOUS]
    |           |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |           |              +- ClassOrInterfaceBody[@Empty = false, @Size = 4]
    |           |                 +- FieldDeclaration[@EffectiveVisibility = Visibility.V_ANONYMOUS, @Static = false, @Visibility = Visibility.V_PACKAGE]
    |           |                 |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |           |                 |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Iterator"]
+   |           |                 |  +- ClassType[@FullyQualified = false, @SimpleName = "Iterator"]
    |           |                 |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |           |                 |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "E"]
+   |           |                 |  |     +- ClassType[@FullyQualified = false, @SimpleName = "E"]
    |           |                 |  +- VariableDeclarator[@Initializer = true, @Name = "wrapped"]
    |           |                 |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_ANONYMOUS, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = true, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "wrapped", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |           |                 |     +- MethodCall[@CompileTimeConstant = false, @Image = "iterator", @MethodName = "iterator", @ParenthesisDepth = 0, @Parenthesized = false]
    |           |                 |        +- SuperExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |           |                 |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ImmutableSet"]
+   |           |                 |        |  +- ClassType[@FullyQualified = false, @SimpleName = "ImmutableSet"]
    |           |                 |        +- ArgumentList[@Empty = true, @Size = 0]
    |           |                 +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Final = false, @Image = "hasNext", @Name = "hasNext", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |           |                 |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
@@ -492,7 +492,7 @@
    |           |                 |           +- ArgumentList[@Empty = true, @Size = 0]
    |           |                 +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_ANONYMOUS, @Final = false, @Image = "next", @Name = "next", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |           |                 |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-   |           |                 |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "E"]
+   |           |                 |  +- ClassType[@FullyQualified = false, @SimpleName = "E"]
    |           |                 |  +- FormalParameters[@Empty = true, @Size = 0]
    |           |                 |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |           |                 |     +- ReturnStatement[]
@@ -509,7 +509,7 @@
    |           |                       |  +- MethodCall[@CompileTimeConstant = false, @Image = "contains", @MethodName = "contains", @ParenthesisDepth = 0, @Parenthesized = false]
    |           |                       |  |  +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "mods", @Name = "mods", @ParenthesisDepth = 0, @Parenthesized = false]
    |           |                       |  |  |  +- ThisExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |           |                       |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ImmutableSet"]
+   |           |                       |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "ImmutableSet"]
    |           |                       |  |  +- ArgumentList[@Empty = false, @Size = 1]
    |           |                       |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "RemoveIter", @Name = "RemoveIter", @ParenthesisDepth = 0, @Parenthesized = false]
    |           |                       |  |        +- AmbiguousName[@CompileTimeConstant = false, @Image = "Modification", @Name = "Modification", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -521,11 +521,11 @@
    |           |                       |           +- ArgumentList[@Empty = true, @Size = 0]
    |           |                       +- ThrowStatement[]
    |           |                          +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |           |                             +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "UnsupportedOperationException"]
+   |           |                             +- ClassType[@FullyQualified = false, @SimpleName = "UnsupportedOperationException"]
    |           |                             +- ArgumentList[@Empty = true, @Size = 0]
    |           +- ThrowStatement[]
    |              +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |                 +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "UnsupportedOperationException"]
+   |                 +- ClassType[@FullyQualified = false, @SimpleName = "UnsupportedOperationException"]
    |                 +- ArgumentList[@Empty = true, @Size = 0]
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ClazzPropertyOfPrimitiveTypes", @CanonicalName = "ClazzPropertyOfPrimitiveTypes", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "ClazzPropertyOfPrimitiveTypes", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PACKAGE]
       +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -537,7 +537,7 @@
             +- Block[@Empty = false, @Size = 11, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Class"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Class"]
                |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
                |  |     +- WildcardType[@LowerBound = false, @UpperBound = true]
                |  +- VariableDeclarator[@Initializer = true, @Name = "c"]
@@ -628,7 +628,7 @@
                   +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.CONDITIONAL_OR, @ParenthesisDepth = 0, @Parenthesized = false]
                   |  +- MethodCall[@CompileTimeConstant = false, @Image = "equals", @MethodName = "equals", @ParenthesisDepth = 1, @Parenthesized = true]
                   |  |  +- ClassLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+                  |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
                   |  |  +- ArgumentList[@Empty = false, @Size = 1]
                   |  |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "clazz", @Name = "clazz", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  +- MethodCall[@CompileTimeConstant = false, @Image = "equals", @MethodName = "equals", @ParenthesisDepth = 1, @Parenthesized = true]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases17.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases17.txt
index 0d96ae36ce..43d85b8b59 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases17.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases17.txt
@@ -142,7 +142,7 @@
          |                 +- SwitchLabel[@Default = true]
          |                 +- ThrowStatement[]
          |                    +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |                       +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
+         |                       +- ClassType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
          |                       +- ArgumentList[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "underscoreInNumericLiterals", @Name = "underscoreInNumericLiterals", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
          |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
@@ -241,18 +241,18 @@
          |           +- NumericLiteral[@Base = 8, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "05_2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "stringsInSwitchStatements", @Name = "stringsInSwitchStatements", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  +- FormalParameters[@Empty = true, @Size = 0]
          |  +- Block[@Empty = false, @Size = 4, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "dayOfWeekArg"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "dayOfWeekArg", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Wednesday", @Empty = false, @Image = "\"Wednesday\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = false, @Name = "typeOfDay"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "typeOfDay", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -302,7 +302,7 @@
          |     |     +- SwitchLabel[@Default = true]
          |     |     +- ThrowStatement[]
          |     |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
+         |     |           +- ClassType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Invalid day of the week: ", @Empty = false, @Image = "\"Invalid day of the week: \"", @Length = 25, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -321,7 +321,7 @@
          |        +- FormalParameters[@Empty = false, @Size = 1]
          |        |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |        |     +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = true, @Size = 0, @containsComment = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "typeInferenceForGenericInstanceCreation", @Name = "typeInferenceForGenericInstanceCreation", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -331,27 +331,27 @@
          |  +- Block[@Empty = false, @Size = 6, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Map"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Map"]
          |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 2]
-         |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
-         |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+         |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "List"]
          |     |  |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |     |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "myMap"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "myMap", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = true, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "HashMap"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "HashMap"]
          |     |        |  +- TypeArguments[@Diamond = true, @Empty = true, @Size = 0]
          |     |        +- ArgumentList[@Empty = true, @Size = 0]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "List"]
          |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "list"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "list", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = true, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ArrayList"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "ArrayList"]
          |     |        |  +- TypeArguments[@Diamond = true, @Empty = true, @Size = 0]
          |     |        +- ArgumentList[@Empty = true, @Size = 0]
          |     +- ExpressionStatement[]
@@ -361,14 +361,14 @@
          |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A", @Empty = false, @Image = "\"A\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "List"]
          |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
          |     |  |     +- WildcardType[@LowerBound = false, @UpperBound = true]
-         |     |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "list2"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "list2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = true, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ArrayList"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "ArrayList"]
          |     |        |  +- TypeArguments[@Diamond = true, @Empty = true, @Size = 0]
          |     |        +- ArgumentList[@Empty = true, @Size = 0]
          |     +- ExpressionStatement[]
@@ -378,13 +378,13 @@
          |     |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "list2", @Name = "list2", @ParenthesisDepth = 0, @Parenthesized = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyClass"]
+         |        +- ClassType[@FullyQualified = false, @SimpleName = "MyClass"]
          |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        +- VariableDeclarator[@Initializer = true, @Name = "myObject"]
          |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "myObject", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = true, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyClass"]
+         |              +- ClassType[@FullyQualified = false, @SimpleName = "MyClass"]
          |              |  +- TypeArguments[@Diamond = true, @Empty = true, @Size = 0]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "", @Empty = true, @Image = "\"\"", @Length = 0, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -393,11 +393,11 @@
          |  +- VoidType[]
          |  +- FormalParameters[@Empty = true, @Size = 0]
          |  +- ThrowsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IOException"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "IOException"]
          |  +- Block[@Empty = false, @Size = 7, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "path"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "path", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "/foo", @Empty = false, @Image = "\"/foo\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -406,20 +406,20 @@
          |     |  |  +- Resource[@ConciseResource = false, @StableName = "br"]
          |     |  |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = true, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |        +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{}"]
-         |     |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "BufferedReader"]
+         |     |  |        +- ClassType[@FullyQualified = false, @SimpleName = "BufferedReader"]
          |     |  |        +- VariableDeclarator[@Initializer = true, @Name = "br"]
          |     |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "br", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |  |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "BufferedReader"]
+         |     |  |              +- ClassType[@FullyQualified = false, @SimpleName = "BufferedReader"]
          |     |  |              +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |  |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FileReader"]
+         |     |  |                    +- ClassType[@FullyQualified = false, @SimpleName = "FileReader"]
          |     |  |                    +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |                       +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "path", @Name = "path", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |        +- VariableDeclarator[@Initializer = true, @Name = "first"]
          |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "first", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |           +- MethodCall[@CompileTimeConstant = false, @Image = "readLine", @MethodName = "readLine", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -427,34 +427,34 @@
          |     |              +- ArgumentList[@Empty = true, @Size = 0]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "outputFileName"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "outputFileName", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "/foo-out", @Empty = false, @Image = "\"/foo-out\"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "zipFileName"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "zipFileName", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "/foo.zip", @Empty = false, @Image = "\"/foo.zip\"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Charset"]
+         |     |  +- ClassType[@FullyQualified = true, @SimpleName = "Charset"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "charset"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "charset", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- MethodCall[@CompileTimeConstant = false, @Image = "forName", @MethodName = "forName", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |        |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Charset"]
+         |     |        |  +- ClassType[@FullyQualified = true, @SimpleName = "Charset"]
          |     |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "US-ASCII", @Empty = false, @Image = "\"US-ASCII\"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Path"]
+         |     |  +- ClassType[@FullyQualified = true, @SimpleName = "Path"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "outputFilePath"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "outputFilePath", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- MethodCall[@CompileTimeConstant = false, @Image = "get", @MethodName = "get", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |        |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Paths"]
+         |     |        |  +- ClassType[@FullyQualified = true, @SimpleName = "Paths"]
          |     |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |           +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "outputFileName", @Name = "outputFileName", @ParenthesisDepth = 0, @Parenthesized = false]
          |     +- TryStatement[@TryWithResources = true]
@@ -462,22 +462,22 @@
          |        |  +- Resource[@ConciseResource = false, @StableName = "zf"]
          |        |  |  +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = true, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "ZipFile"]
+         |        |  |     +- ClassType[@FullyQualified = true, @SimpleName = "ZipFile"]
          |        |  |     +- VariableDeclarator[@Initializer = true, @Name = "zf"]
          |        |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "zf", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |        |  |           +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "ZipFile"]
+         |        |  |           +- ClassType[@FullyQualified = true, @SimpleName = "ZipFile"]
          |        |  |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "zipFileName", @Name = "zipFileName", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- Resource[@ConciseResource = false, @StableName = "writer"]
          |        |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = true, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |        +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{}"]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "BufferedWriter"]
+         |        |        +- ClassType[@FullyQualified = true, @SimpleName = "BufferedWriter"]
          |        |        +- VariableDeclarator[@Initializer = true, @Name = "writer"]
          |        |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "writer", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- MethodCall[@CompileTimeConstant = false, @Image = "newBufferedWriter", @MethodName = "newBufferedWriter", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |              +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |              |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Files"]
+         |        |              |  +- ClassType[@FullyQualified = true, @SimpleName = "Files"]
          |        |              +- ArgumentList[@Empty = false, @Size = 2]
          |        |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "outputFilePath", @Name = "outputFilePath", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "charset", @Name = "charset", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -486,10 +486,10 @@
          |              +- ForInit[]
          |              |  +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |              |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Enumeration"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "Enumeration"]
          |              |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
          |              |     |     +- WildcardType[@LowerBound = false, @UpperBound = true]
-         |              |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ZipEntry"]
+         |              |     |        +- ClassType[@FullyQualified = false, @SimpleName = "ZipEntry"]
          |              |     +- VariableDeclarator[@Initializer = true, @Name = "entries"]
          |              |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = true, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "entries", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |              |        +- MethodCall[@CompileTimeConstant = false, @Image = "entries", @MethodName = "entries", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -501,23 +501,23 @@
          |              +- Block[@Empty = false, @Size = 3, @containsComment = false]
          |                 +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |                 |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |                 |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |                 |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |                 |  +- VariableDeclarator[@Initializer = true, @Name = "newLine"]
          |                 |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "newLine", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |                 |     +- MethodCall[@CompileTimeConstant = false, @Image = "getProperty", @MethodName = "getProperty", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |        |  +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 |        +- ArgumentList[@Empty = false, @Size = 1]
          |                 |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "line.separator", @Empty = false, @Image = "\"line.separator\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |                 +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |                 |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |                 |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |                 |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |                 |  +- VariableDeclarator[@Initializer = true, @Name = "zipEntryName"]
          |                 |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "zipEntryName", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |                 |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |        +- MethodCall[@CompileTimeConstant = false, @Image = "getName", @MethodName = "getName", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |        |  +- CastExpression[@CompileTimeConstant = false, @ParenthesisDepth = 1, @Parenthesized = true]
-         |                 |        |  |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "ZipEntry"]
+         |                 |        |  |  +- ClassType[@FullyQualified = true, @SimpleName = "ZipEntry"]
          |                 |        |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "nextElement", @MethodName = "nextElement", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |        |  |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "entries", @Name = "entries", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |        |  |     +- ArgumentList[@Empty = true, @Size = 0]
@@ -537,29 +537,29 @@
          |  +- VoidType[]
          |  +- FormalParameters[@Empty = true, @Size = 0]
          |  +- ThrowsList[@Empty = false, @Size = 2]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IOException"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SQLException"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "IOException"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "SQLException"]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- TryStatement[@TryWithResources = false]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |  +- IfStatement[@Else = false]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "createNewFile", @MethodName = "createNewFile", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |        |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "File"]
+         |        |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "File"]
          |        |     |  |  +- ArgumentList[@Empty = false, @Size = 1]
          |        |     |  |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "foo", @Empty = false, @Image = "\"foo\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |     |  +- ArgumentList[@Empty = true, @Size = 0]
          |        |     +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |        +- ThrowStatement[]
          |        |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SQLException"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "SQLException"]
          |        |              +- ArgumentList[@Empty = true, @Size = 0]
          |        +- CatchClause[]
          |           +- CatchParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Multicatch = true, @Name = "ex", @Visibility = Visibility.V_PACKAGE]
          |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |           |  +- UnionType[]
-         |           |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IOException"]
-         |           |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SQLException"]
+         |           |  |  +- ClassType[@FullyQualified = false, @SimpleName = "IOException"]
+         |           |  |  +- ClassType[@FullyQualified = false, @SimpleName = "SQLException"]
          |           |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = true, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "ex", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
          |           +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |              +- ExpressionStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases18.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases18.txt
index 2a098a5bde..141c7fb47a 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases18.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases18.txt
@@ -19,14 +19,14 @@
    |     |  +- Block[@Empty = false, @Size = 24, @containsComment = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FileFilter"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "FileFilter"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "java"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "java", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 1, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- LambdaParameterList[@Empty = false, @Size = 1]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "File"]
+   |     |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "File"]
    |     |     |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "f", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "endsWith", @MethodName = "endsWith", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |           +- MethodCall[@CompileTimeConstant = false, @Image = "getName", @MethodName = "getName", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -36,7 +36,7 @@
    |     |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = ".java", @Empty = false, @Image = "\".java\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FileFilter"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "FileFilter"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "java2"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "java2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 1, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -52,7 +52,7 @@
    |     |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = ".java", @Empty = false, @Image = "\".java\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FileFilter"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "FileFilter"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "java3"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "java3", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 1, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -68,7 +68,7 @@
    |     |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = ".java", @Empty = false, @Image = "\".java\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FileFilter"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "FileFilter"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "java4"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "java4", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 1, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 1, @Parenthesized = true]
@@ -111,14 +111,14 @@
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |     |     |  +- ArrayType[@ArrayDepth = 1]
-   |     |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FileFilter"]
+   |     |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "FileFilter"]
    |     |     |  |  +- ArrayDimensions[@Empty = false, @Size = 1]
    |     |     |  |     +- ArrayTypeDim[@Varargs = false]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "filters"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "filters", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- ArrayAllocation[@ArrayDepth = 1, @CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- ArrayType[@ArrayDepth = 1]
-   |     |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FileFilter"]
+   |     |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "FileFilter"]
    |     |     |        |  +- ArrayDimensions[@Empty = false, @Size = 1]
    |     |     |        |     +- ArrayTypeDim[@Varargs = false]
    |     |     |        +- ArrayInitializer[@CompileTimeConstant = false, @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -154,7 +154,7 @@
    |     |     |     +- ArgumentList[@Empty = false, @Size = 1]
    |     |     |        +- ArrayAllocation[@ArrayDepth = 1, @CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |           +- ArrayType[@ArrayDepth = 1]
-   |     |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FileFilter"]
+   |     |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "FileFilter"]
    |     |     |           |  +- ArrayDimensions[@Empty = false, @Size = 1]
    |     |     |           |     +- ArrayTypeDim[@Varargs = false]
    |     |     |           +- ArrayInitializer[@CompileTimeConstant = false, @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -187,7 +187,7 @@
    |     |     |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "q", @Empty = false, @Image = "\"q\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "user"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "user", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- MethodCall[@CompileTimeConstant = false, @Image = "doPrivileged", @MethodName = "doPrivileged", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -196,14 +196,14 @@
    |     |     |              +- LambdaParameterList[@Empty = true, @Size = 0]
    |     |     |              +- MethodCall[@CompileTimeConstant = false, @Image = "getProperty", @MethodName = "getProperty", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |                 +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |                 |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |     |                 |  +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |     |                 +- ArgumentList[@Empty = false, @Size = 1]
    |     |     |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "user.name", @Empty = false, @Image = "\"user.name\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Callable"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Callable"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "c"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "c", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 0, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -211,7 +211,7 @@
    |     |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "done", @Empty = false, @Image = "\"done\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "r"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 0, @BlockBody = true, @CompileTimeConstant = false, @ExpressionBody = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -221,14 +221,14 @@
    |     |     |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |     |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |     |                 +- ArgumentList[@Empty = false, @Size = 1]
    |     |     |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "done", @Empty = false, @Image = "\"done\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Supplier"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Supplier"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "sup"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "sup", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 0, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -240,7 +240,7 @@
    |     |     |                 +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |                    +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |                    |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |     |                    |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |     |                    +- ArgumentList[@Empty = false, @Size = 1]
    |     |     |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "hi", @Empty = false, @Image = "\"hi\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -253,9 +253,9 @@
    |     |     |        +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Callable"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Callable"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "c2"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "c2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- ConditionalExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -268,11 +268,11 @@
    |     |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "o"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- CastExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |     |        +- LambdaExpression[@Arity = 0, @BlockBody = true, @CompileTimeConstant = false, @ExpressionBody = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |           +- LambdaParameterList[@Empty = true, @Size = 0]
    |     |     |           +- Block[@Empty = false, @Size = 1, @containsComment = false]
@@ -280,21 +280,21 @@
    |     |     |                 +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |                    +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |                    |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |     |                    |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |     |                    +- ArgumentList[@Empty = false, @Size = 1]
    |     |     |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "hi", @Empty = false, @Image = "\"hi\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |     +- ExpressionStatement[]
    |     |     |  +- MethodCall[@CompileTimeConstant = false, @Image = "run", @MethodName = "run", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r1", @Name = "r1", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |     |  +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |     |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
+   |     |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
    |     |     |     |     +- ArgumentList[@Empty = true, @Size = 0]
    |     |     |     +- ArgumentList[@Empty = true, @Size = 0]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Comparator"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Comparator"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "comparer"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "comparer", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 2, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -326,11 +326,11 @@
    |     |     |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s2", @Name = "s2", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Button"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Button"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "button"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "button", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |     |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Button"]
+   |     |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Button"]
    |     |     |        +- ArgumentList[@Empty = true, @Size = 0]
    |     |     +- ExpressionStatement[]
    |     |     |  +- MethodCall[@CompileTimeConstant = false, @Image = "addActionListener", @MethodName = "addActionListener", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -344,7 +344,7 @@
    |     |     |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |     |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |     |              +- ArgumentList[@Empty = false, @Size = 1]
    |     |     |                 +- MethodCall[@CompileTimeConstant = false, @Image = "getModifiers", @MethodName = "getModifiers", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |                    +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "e", @Name = "e", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -365,21 +365,21 @@
    |     |     |              +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = true, @FloatLiteral = false, @Image = "0.30", @IntLiteral = false, @Integral = false, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 0.3, @ValueAsFloat = 0.3, @ValueAsInt = 0, @ValueAsLong = 0]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "BiConsumer"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "BiConsumer"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 2]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "lambda2"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "lambda2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 2, @BlockBody = true, @CompileTimeConstant = false, @ExpressionBody = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- LambdaParameterList[@Empty = false, @Size = 2]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |        |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |        |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |        |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
    |     |     |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "i", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     |           +- ExpressionStatement[]
@@ -387,10 +387,10 @@
    |     |     |                 +- VariableAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "BiConsumer"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "BiConsumer"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 2]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "lambda2a"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "lambda2a", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 2, @BlockBody = true, @CompileTimeConstant = false, @ExpressionBody = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -407,26 +407,26 @@
    |     |     |                 +- VariableAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "TriConsumer"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "TriConsumer"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 3]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Double"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Double"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "lambda3"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "lambda3", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- LambdaExpression[@Arity = 3, @BlockBody = true, @CompileTimeConstant = false, @ExpressionBody = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- LambdaParameterList[@Empty = false, @Size = 3]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |        |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |        |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |        |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |        |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |        |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
    |     |     |        |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "i", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Double"]
+   |     |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Double"]
    |     |     |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "d", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     |           +- ExpressionStatement[]
@@ -435,11 +435,11 @@
    |     |     |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "TriConsumer"]
+   |     |        +- ClassType[@FullyQualified = false, @SimpleName = "TriConsumer"]
    |     |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 3]
-   |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
-   |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
-   |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Double"]
+   |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
+   |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Double"]
    |     |        +- VariableDeclarator[@Initializer = true, @Name = "lambda3a"]
    |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "lambda3a", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |           +- LambdaExpression[@Arity = 3, @BlockBody = true, @CompileTimeConstant = false, @ExpressionBody = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -461,7 +461,7 @@
    |     +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "ParserCornerCases18$TriConsumer", @CanonicalName = "ParserCornerCases18.TriConsumer", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "TriConsumer", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PUBLIC]
    |     |  +- ModifierList[@EffectiveModifiers = "{public, abstract, static}", @ExplicitModifiers = "{public}"]
    |     |  |  +- Annotation[@SimpleName = "FunctionalInterface"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FunctionalInterface"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "FunctionalInterface"]
    |     |  +- TypeParameters[@Empty = false, @Size = 3]
    |     |  |  +- TypeParameter[@Image = "A", @Name = "A", @TypeBound = false]
    |     |  |  +- TypeParameter[@Image = "B", @Name = "B", @TypeBound = false]
@@ -473,19 +473,19 @@
    |     |        +- FormalParameters[@Empty = false, @Size = 3]
    |     |           +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+   |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "A"]
    |     |           |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |           +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+   |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "B"]
    |     |           |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "b", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |           +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+   |     |              +- ClassType[@FullyQualified = false, @SimpleName = "C"]
    |     |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     +- FieldDeclaration[@EffectiveVisibility = Visibility.V_PACKAGE, @Static = false, @Visibility = Visibility.V_PACKAGE]
    |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |  +- VariableDeclarator[@Initializer = true, @Name = "r1"]
    |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = true, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "r1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     +- LambdaExpression[@Arity = 0, @BlockBody = true, @CompileTimeConstant = false, @ExpressionBody = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -495,12 +495,12 @@
    |     |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |                 +- ArgumentList[@Empty = false, @Size = 1]
    |     |                    +- ThisExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "toDoLater", @Name = "toDoLater", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -511,18 +511,18 @@
    |     |                 +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |                    +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |                    |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |                    |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |                    +- ArgumentList[@Empty = false, @Size = 1]
    |     |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "later", @Empty = false, @Image = "\"later\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PRIVATE, @Final = false, @Image = "doPrivileged", @Name = "doPrivileged", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PRIVATE, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{private}", @ExplicitModifiers = "{private}"]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |  +- FormalParameters[@Empty = false, @Size = 1]
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "PrivilegedAction"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "PrivilegedAction"]
    |     |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "action", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -536,7 +536,7 @@
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |     |  |     +- ArrayType[@ArrayDepth = 1]
-   |     |  |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "FileFilter"]
+   |     |  |     |  +- ClassType[@FullyQualified = false, @SimpleName = "FileFilter"]
    |     |  |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
    |     |  |     |     +- ArrayTypeDim[@Varargs = false]
    |     |  |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "filters", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -545,29 +545,29 @@
    |     |  +- ModifierList[@EffectiveModifiers = "{public, static}", @ExplicitModifiers = "{public, static}"]
    |     |  +- TypeParameters[@Empty = false, @Size = 2]
    |     |  |  +- TypeParameter[@Image = "K", @Name = "K", @TypeBound = true]
-   |     |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Comparable"]
+   |     |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Comparable"]
    |     |  |  |     +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
    |     |  |  |        +- WildcardType[@LowerBound = true, @UpperBound = false]
-   |     |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "K"]
+   |     |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "K"]
    |     |  |  +- TypeParameter[@Image = "V", @Name = "V", @TypeBound = false]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Comparator"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Comparator"]
    |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Entry"]
+   |     |  |     +- ClassType[@FullyQualified = true, @SimpleName = "Entry"]
    |     |  |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 2]
-   |     |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "K"]
-   |     |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "V"]
+   |     |  |           +- ClassType[@FullyQualified = false, @SimpleName = "K"]
+   |     |  |           +- ClassType[@FullyQualified = false, @SimpleName = "V"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
    |     |        +- CastExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |           +- IntersectionType[]
-   |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Comparator"]
+   |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Comparator"]
    |     |           |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |           |  |     +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Entry"]
+   |     |           |  |     +- ClassType[@FullyQualified = true, @SimpleName = "Entry"]
    |     |           |  |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 2]
-   |     |           |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "K"]
-   |     |           |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "V"]
-   |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Serializable"]
+   |     |           |  |           +- ClassType[@FullyQualified = false, @SimpleName = "K"]
+   |     |           |  |           +- ClassType[@FullyQualified = false, @SimpleName = "V"]
+   |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Serializable"]
    |     |           +- LambdaExpression[@Arity = 2, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |              +- LambdaParameterList[@Empty = false, @Size = 2]
    |     |              |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = true, @Visibility = Visibility.V_PACKAGE]
@@ -591,55 +591,55 @@
    |     |  +- Block[@Empty = false, @Size = 8, @containsComment = true]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "r"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = false, @MethodName = "toDoLater", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |     |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
+   |     |     |           +- ClassType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
    |     |     |           +- ArgumentList[@Empty = true, @Size = 0]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "r1"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = false, @MethodName = "toDoLater", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- ThisExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "pc"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "pc", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |     |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
+   |     |     |        +- ClassType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
    |     |     |        +- ArgumentList[@Empty = true, @Size = 0]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "r11"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r11", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = false, @MethodName = "toDoLater", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "pc", @Name = "pc", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Supplier"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Supplier"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "s"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = false, @MethodName = "toString", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- SuperExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "r2"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = false, @MethodName = "staticMethod", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
+   |     |     |           +- ClassType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IntFunction"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "IntFunction"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
    |     |     |  |     +- ArrayType[@ArrayDepth = 1]
    |     |     |  |        +- PrimitiveType[@Kind = PrimitiveTypeKind.INT]
@@ -670,10 +670,10 @@
    |     |  +- ClassOrInterfaceBody[@Empty = false, @Size = 3]
    |     |     +- FieldDeclaration[@EffectiveVisibility = Visibility.V_PACKAGE, @Static = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Function"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Function"]
    |     |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 2]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
-   |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
    |     |     |  +- VariableDeclarator[@Initializer = false, @Name = "theFunction"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = true, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "theFunction", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     +- ConstructorDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Image = "PmdTest", @Name = "PmdTest", @Varargs = false, @Visibility = Visibility.V_PUBLIC, @containsComment = false]
@@ -698,7 +698,7 @@
    |     |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "staticMethod", @Name = "staticMethod", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public, static}", @ExplicitModifiers = "{public, static}"]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Runnable"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Runnable"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -707,7 +707,7 @@
    |     |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |              +- ArgumentList[@Empty = false, @Size = 1]
    |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "run", @Empty = false, @Image = "\"run\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "typeAnnotations", @Name = "typeAnnotations", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -717,45 +717,45 @@
    |     |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |  +- VariableDeclarator[@Initializer = true, @Name = "myString"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "myString", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |     |     +- CastExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |     |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |     |        |  +- Annotation[@SimpleName = "NonNull"]
-   |     |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NonNull"]
+   |     |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "NonNull"]
    |     |     |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "str", @Name = "str", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |     |        +- VariableDeclarator[@Initializer = true, @Name = "o"]
    |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyObject"]
+   |     |              +- ClassType[@FullyQualified = false, @SimpleName = "MyObject"]
    |     |              |  +- Annotation[@SimpleName = "Interned"]
-   |     |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Interned"]
+   |     |              |     +- ClassType[@FullyQualified = false, @SimpleName = "Interned"]
    |     |              +- ArgumentList[@Empty = true, @Size = 0]
    |     +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ParserCornerCases18$UnmodifiableList", @CanonicalName = "ParserCornerCases18.UnmodifiableList", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "UnmodifiableList", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
    |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |     |  +- TypeParameters[@Empty = false, @Size = 1]
    |     |  |  +- TypeParameter[@Image = "T", @Name = "T", @TypeBound = false]
    |     |  +- ImplementsList[@Empty = false, @Size = 1]
-   |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+   |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "List"]
    |     |  |     +- Annotation[@SimpleName = "Readonly"]
-   |     |  |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Readonly"]
+   |     |  |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Readonly"]
    |     |  |     +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-   |     |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+   |     |  |        +- ClassType[@FullyQualified = false, @SimpleName = "T"]
    |     |  |           +- Annotation[@SimpleName = "Readonly"]
-   |     |  |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Readonly"]
+   |     |  |              +- ClassType[@FullyQualified = false, @SimpleName = "Readonly"]
    |     |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "monitorTemperature", @Name = "monitorTemperature", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
    |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |     |  +- VoidType[]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- ThrowsList[@Empty = false, @Size = 1]
-   |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "TemperatureException"]
+   |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "TemperatureException"]
    |     |  |     +- Annotation[@SimpleName = "Critical"]
-   |     |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Critical"]
+   |     |  |        +- ClassType[@FullyQualified = false, @SimpleName = "Critical"]
    |     |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
    |     +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ParserCornerCases18$X", @CanonicalName = "ParserCornerCases18.X", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "X", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PUBLIC]
    |     |  +- ModifierList[@EffectiveModifiers = "{public, static}", @ExplicitModifiers = "{public, static}"]
@@ -770,7 +770,7 @@
    |     |     |           +- MethodCall[@CompileTimeConstant = false, @Image = "sorted", @MethodName = "sorted", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "of", @MethodName = "of", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |           |  |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |           |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Stream"]
+   |     |     |           |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Stream"]
    |     |     |           |  |  +- ArgumentList[@Empty = false, @Size = 3]
    |     |     |           |  |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "1", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 1.0, @ValueAsFloat = 1.0, @ValueAsInt = 1, @ValueAsLong = 1]
    |     |     |           |  |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
@@ -802,7 +802,7 @@
    |     |     |           |           |  |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "a", @Name = "a", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |           |           |  |  +- ArgumentList[@Empty = false, @Size = 1]
    |     |     |           |           |  |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |     |     |           |           |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "X"]
+   |     |     |           |           |  |        +- ClassType[@FullyQualified = false, @SimpleName = "X"]
    |     |     |           |           |  |        +- ArgumentList[@Empty = true, @Size = 0]
    |     |     |           |           |  +- ExpressionStatement[]
    |     |     |           |           |     +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -821,7 +821,7 @@
    |     |     |           +- MethodCall[@CompileTimeConstant = false, @Image = "sorted", @MethodName = "sorted", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "of", @MethodName = "of", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |           |  |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |     |           |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Stream"]
+   |     |     |           |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Stream"]
    |     |     |           |  |  +- ArgumentList[@Empty = false, @Size = 3]
    |     |     |           |  |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "1", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 1.0, @ValueAsFloat = 1.0, @ValueAsInt = 1, @ValueAsLong = 1]
    |     |     |           |  |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
@@ -831,11 +831,11 @@
    |     |     |           |        +- LambdaParameterList[@Empty = false, @Size = 2]
    |     |     |           |        |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |           |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |           |        |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |           |        |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
    |     |     |           |        |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "a", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |           |        |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |           |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |     |           |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+   |     |     |           |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
    |     |     |           |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "b", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     |     |           |        +- Block[@Empty = false, @Size = 3, @containsComment = false]
    |     |     |           |           +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -855,7 +855,7 @@
    |     |     |           |           |  |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "a", @Name = "a", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |     |           |           |  |  +- ArgumentList[@Empty = false, @Size = 1]
    |     |     |           |           |  |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |     |     |           |           |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "X"]
+   |     |     |           |           |  |        +- ClassType[@FullyQualified = false, @SimpleName = "X"]
    |     |     |           |           |  |        +- ArgumentList[@Empty = true, @Size = 0]
    |     |     |           |           |  +- ExpressionStatement[]
    |     |     |           |           |     +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -878,11 +878,11 @@
    |     |                    +- Block[@Empty = false, @Size = 2, @containsComment = true]
    |     |                       +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |                       |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |                       |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Request"]
+   |     |                       |  +- ClassType[@FullyQualified = false, @SimpleName = "Request"]
    |     |                       |  +- VariableDeclarator[@Initializer = true, @Name = "request"]
    |     |                       |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "request", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |                       |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |     |                       |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Request"]
+   |     |                       |        +- ClassType[@FullyQualified = false, @SimpleName = "Request"]
    |     |                       |        +- ArgumentList[@Empty = true, @Size = 0]
    |     |                       +- ExpressionStatement[]
    |     |                          +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -891,11 +891,11 @@
    |     |                             +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "testWildCardWithAnnotation", @Name = "testWildCardWithAnnotation", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "List"]
    |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
    |     |  |     +- WildcardType[@LowerBound = false, @UpperBound = true]
    |     |  |        +- Annotation[@SimpleName = "AnnotatedUsage"]
-   |     |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "AnnotatedUsage"]
+   |     |  |           +- ClassType[@FullyQualified = false, @SimpleName = "AnnotatedUsage"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -903,11 +903,11 @@
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "testAnnotationsToArrayElements", @Name = "testAnnotationsToArrayElements", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
    |     |  +- ArrayType[@ArrayDepth = 1]
-   |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |     |  |  +- ArrayDimensions[@Empty = false, @Size = 1]
    |     |  |     +- ArrayTypeDim[@Varargs = false]
    |     |  |        +- Annotation[@SimpleName = "Nullable"]
-   |     |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Nullable"]
+   |     |  |           +- ClassType[@FullyQualified = false, @SimpleName = "Nullable"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -919,7 +919,7 @@
    |     |  |  +- ArrayDimensions[@Empty = false, @Size = 1]
    |     |  |     +- ArrayTypeDim[@Varargs = false]
    |     |  |        +- Annotation[@SimpleName = "Nullable"]
-   |     |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Nullable"]
+   |     |  |           +- ClassType[@FullyQualified = false, @SimpleName = "Nullable"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -928,12 +928,12 @@
    |     |  +- ModifierList[@EffectiveModifiers = "{public, static}", @ExplicitModifiers = "{public, static}"]
    |     |  +- TypeParameters[@Empty = false, @Size = 1]
    |     |  |  +- TypeParameter[@Image = "T", @Name = "T", @TypeBound = true]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Enum"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Enum"]
    |     |  |        +- Annotation[@SimpleName = "NonNull"]
-   |     |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NonNull"]
+   |     |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "NonNull"]
    |     |  |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
    |     |  |           +- WildcardType[@LowerBound = false, @UpperBound = true]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "T"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -942,9 +942,9 @@
    |     |  +- ModifierList[@EffectiveModifiers = "{public, static}", @ExplicitModifiers = "{public, static}"]
    |     |  +- TypeParameters[@Empty = false, @Size = 1]
    |     |  |  +- TypeParameter[@Image = "T", @Name = "T", @TypeBound = false]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "T"]
    |     |  |  +- Annotation[@SimpleName = "Nullable"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Nullable"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Nullable"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -952,7 +952,7 @@
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "createNonNullArray", @Name = "createNonNullArray", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
    |     |  +- ArrayType[@ArrayDepth = 1]
-   |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |     |  |  +- ArrayDimensions[@Empty = false, @Size = 1]
    |     |  |     +- ArrayTypeDim[@Varargs = false]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
@@ -960,18 +960,18 @@
    |     |     +- ReturnStatement[]
    |     |        +- ArrayAllocation[@ArrayDepth = 1, @CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |           +- ArrayType[@ArrayDepth = 1]
-   |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |     |              +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |     |              +- ArrayDimensions[@Empty = false, @Size = 1]
    |     |                 +- ArrayDimExpr[@Varargs = false]
    |     |                    +- Annotation[@SimpleName = "NonNull"]
-   |     |                    |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NonNull"]
+   |     |                    |  +- ClassType[@FullyQualified = false, @SimpleName = "NonNull"]
    |     |                    +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "0", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 0.0, @ValueAsFloat = 0.0, @ValueAsInt = 0, @ValueAsLong = 0]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "check", @Name = "check", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public, static}", @ExplicitModifiers = "{public, static}"]
    |     |  +- TypeParameters[@Empty = false, @Size = 1]
    |     |  |  +- TypeParameter[@Image = "T", @Name = "T", @TypeBound = false]
    |     |  +- ArrayType[@ArrayDepth = 2]
-   |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+   |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "T"]
    |     |  |  +- ArrayDimensions[@Empty = false, @Size = 2]
    |     |  |     +- ArrayTypeDim[@Varargs = false]
    |     |  |     +- ArrayTypeDim[@Varargs = false]
@@ -979,14 +979,14 @@
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |     |  |     +- ArrayType[@ArrayDepth = 2]
-   |     |  |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+   |     |  |     |  +- ClassType[@FullyQualified = false, @SimpleName = "T"]
    |     |  |     |  +- ArrayDimensions[@Empty = false, @Size = 2]
    |     |  |     |     +- ArrayTypeDim[@Varargs = false]
    |     |  |     |     |  +- Annotation[@SimpleName = "Anno"]
-   |     |  |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Anno"]
+   |     |  |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Anno"]
    |     |  |     |     +- ArrayTypeDim[@Varargs = false]
    |     |  |     |        +- Annotation[@SimpleName = "Anno"]
-   |     |  |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Anno"]
+   |     |  |     |           +- ClassType[@FullyQualified = false, @SimpleName = "Anno"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "arr", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
    |     |     +- IfStatement[@Else = false]
@@ -996,24 +996,24 @@
    |     |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     |     +- ThrowStatement[]
    |     |     |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |     |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NullPointerException"]
+   |     |     |           +- ClassType[@FullyQualified = false, @SimpleName = "NullPointerException"]
    |     |     |           +- ArgumentList[@Empty = true, @Size = 0]
    |     |     +- ReturnStatement[]
    |     |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "arr", @Name = "arr", @ParenthesisDepth = 0, @Parenthesized = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "func", @Name = "func", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-   |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Function"]
+   |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Function"]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  |  +- ReceiverParameter[]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Main"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Main"]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = true]
    |     |     +- ReturnStatement[]
    |     |        +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = true, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |           +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Inner"]
-   |     |                 +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Main"]
+   |     |              +- ClassType[@FullyQualified = false, @SimpleName = "Inner"]
+   |     |                 +- ClassType[@FullyQualified = false, @SimpleName = "Main"]
    |     |                    +- Annotation[@SimpleName = "A"]
-   |     |                       +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+   |     |                       +- ClassType[@FullyQualified = false, @SimpleName = "A"]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "max", @Name = "max", @Overridden = false, @Static = true, @Varargs = true, @Visibility = Visibility.V_PUBLIC, @Void = false]
    |     |  +- ModifierList[@EffectiveModifiers = "{public, static}", @ExplicitModifiers = "{public, static}"]
    |     |  +- PrimitiveType[@Kind = PrimitiveTypeKind.BYTE]
@@ -1025,7 +1025,7 @@
    |     |  |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
    |     |  |     |     +- ArrayTypeDim[@Varargs = true]
    |     |  |     |        +- Annotation[@SimpleName = "NotNull"]
-   |     |  |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NotNull"]
+   |     |  |     |           +- ClassType[@FullyQualified = false, @SimpleName = "NotNull"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "array", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- ReturnStatement[]
@@ -1033,13 +1033,13 @@
    |     +- AnnotationTypeDeclaration[@Abstract = true, @Annotation = true, @Anonymous = false, @BinaryName = "ParserCornerCases18$Anno", @CanonicalName = "ParserCornerCases18.Anno", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "Anno", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
    |     |  +- ModifierList[@EffectiveModifiers = "{abstract, static}", @ExplicitModifiers = "{}"]
    |     |  |  +- Annotation[@SimpleName = "Retention"]
-   |     |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Retention"]
+   |     |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Retention"]
    |     |  |  |  +- AnnotationMemberList[@Empty = false, @Size = 1]
    |     |  |  |     +- MemberValuePair[@Image = "value", @Name = "value", @Shorthand = true]
    |     |  |  |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "CLASS", @Name = "CLASS", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |  |  |           +- AmbiguousName[@CompileTimeConstant = false, @Image = "RetentionPolicy", @Name = "RetentionPolicy", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |  |  +- Annotation[@SimpleName = "Target"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Target"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Target"]
    |     |  |     +- AnnotationMemberList[@Empty = false, @Size = 1]
    |     |  |        +- MemberValuePair[@Image = "value", @Name = "value", @Shorthand = true]
    |     |  |           +- MemberValueArrayInitializer[]
@@ -1052,41 +1052,41 @@
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |     |        +- VariableDeclarator[@Initializer = true, @Name = "x"]
    |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "x", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |           +- ArrayAllocation[@ArrayDepth = 3, @CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |              +- ArrayType[@ArrayDepth = 3]
-   |     |                 +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |     |                 +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |     |                 +- ArrayDimensions[@Empty = false, @Size = 3]
    |     |                    +- ArrayDimExpr[@Varargs = false]
    |     |                    |  +- Annotation[@SimpleName = "NonNull"]
-   |     |                    |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NonNull"]
+   |     |                    |  |  +- ClassType[@FullyQualified = false, @SimpleName = "NonNull"]
    |     |                    |  +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
    |     |                    +- ArrayDimExpr[@Varargs = false]
    |     |                    |  +- Annotation[@SimpleName = "Nullable"]
-   |     |                    |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Nullable"]
+   |     |                    |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Nullable"]
    |     |                    |  +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "1", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 1.0, @ValueAsFloat = 1.0, @ValueAsInt = 1, @ValueAsLong = 1]
    |     |                    +- ArrayDimExpr[@Varargs = false]
    |     |                       +- Annotation[@SimpleName = "NonNull"]
-   |     |                       |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NonNull"]
+   |     |                       |  +- ClassType[@FullyQualified = false, @SimpleName = "NonNull"]
    |     |                       +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "3", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 3.0, @ValueAsFloat = 3.0, @ValueAsInt = 3, @ValueAsLong = 3]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "methodWithReceiverParameter", @Name = "methodWithReceiverParameter", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
    |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
    |     |  +- VoidType[]
    |     |  +- FormalParameters[@Empty = true, @Size = 0]
    |     |  |  +- ReceiverParameter[]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
    |     |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "methodWithReceiverAndOtherParameters", @Name = "methodWithReceiverAndOtherParameters", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
    |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
    |     |  +- VoidType[]
    |     |  +- FormalParameters[@Empty = false, @Size = 1]
    |     |  |  +- ReceiverParameter[]
-   |     |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
+   |     |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "other", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "methodWithReceiverParameterWithAnnotation", @Name = "methodWithReceiverParameterWithAnnotation", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -1094,18 +1094,18 @@
    |     |  +- VoidType[]
    |     |  +- FormalParameters[@Empty = false, @Size = 1]
    |     |  |  +- ReceiverParameter[]
-   |     |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
+   |     |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
    |     |  |  |     +- Annotation[@SimpleName = "AnnotatedUsage"]
-   |     |  |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "AnnotatedUsage"]
+   |     |  |  |        +- ClassType[@FullyQualified = false, @SimpleName = "AnnotatedUsage"]
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "other", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
    |     +- AnnotationTypeDeclaration[@Abstract = true, @Annotation = true, @Anonymous = false, @BinaryName = "ParserCornerCases18$AnnotatedUsage", @CanonicalName = "ParserCornerCases18.AnnotatedUsage", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "AnnotatedUsage", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PUBLIC]
    |     |  +- ModifierList[@EffectiveModifiers = "{public, abstract, static}", @ExplicitModifiers = "{public}"]
    |     |  |  +- Annotation[@SimpleName = "Target"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Target"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Target"]
    |     |  |     +- AnnotationMemberList[@Empty = false, @Size = 1]
    |     |  |        +- MemberValuePair[@Image = "value", @Name = "value", @Shorthand = true]
    |     |  |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "TYPE_USE", @Name = "TYPE_USE", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -1118,7 +1118,7 @@
    |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |              +- FormalParameters[@Empty = true, @Size = 0]
    |              |  +- ReceiverParameter[]
-   |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
+   |              |     +- ClassType[@FullyQualified = false, @SimpleName = "ParserCornerCases18"]
    |              +- Block[@Empty = true, @Size = 0, @containsComment = false]
    +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "DefaultIterator", @CanonicalName = "DefaultIterator", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "DefaultIterator", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PACKAGE]
       +- ModifierList[@EffectiveModifiers = "{abstract}", @ExplicitModifiers = "{}"]
@@ -1131,7 +1131,7 @@
          |  +- FormalParameters[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = true, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "next", @Name = "next", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{public, abstract}", @ExplicitModifiers = "{}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "E"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "E"]
          |  +- FormalParameters[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = true, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "remove", @Name = "remove", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
          |  +- ModifierList[@EffectiveModifiers = "{public, abstract}", @ExplicitModifiers = "{}"]
@@ -1169,6 +1169,6 @@
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "", @Empty = true, @Image = "\"\"", @Length = 0, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/SwitchStatements.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/SwitchStatements.txt
index af7dbe07bd..5c6713623a 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/SwitchStatements.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/SwitchStatements.txt
@@ -31,7 +31,7 @@
                   |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |  |     +- ArgumentList[@Empty = false, @Size = 1]
                   |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "1", @Empty = false, @Image = "\"1\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   |  +- BreakStatement[@Label = null]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/MultipleCaseLabels.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/MultipleCaseLabels.txt
index b4f53a6ef1..6f9ef62036 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/MultipleCaseLabels.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/MultipleCaseLabels.txt
@@ -51,7 +51,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -73,7 +73,7 @@
                   |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |  |     +- ArgumentList[@Empty = false, @Size = 1]
                   |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "  6", @Empty = false, @Image = "\"  6\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   |  +- BreakStatement[@Label = null]
@@ -84,7 +84,7 @@
                   |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |  |     +- ArgumentList[@Empty = false, @Size = 1]
                   |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "  7", @Empty = false, @Image = "\"  7\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   |  +- BreakStatement[@Label = null]
@@ -96,7 +96,7 @@
                   |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |  |     +- ArgumentList[@Empty = false, @Size = 1]
                   |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "  8", @Empty = false, @Image = "\"  8\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   |  +- BreakStatement[@Label = null]
@@ -107,7 +107,7 @@
                      |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      |     +- ArgumentList[@Empty = false, @Size = 1]
                      |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "  9", @Empty = false, @Image = "\"  9\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                      +- BreakStatement[@Label = null]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SimpleSwitchExpressions.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SimpleSwitchExpressions.txt
index 00098f5709..adc23013b9 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SimpleSwitchExpressions.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SimpleSwitchExpressions.txt
@@ -51,7 +51,7 @@
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |  |     +- ArrayType[@ArrayDepth = 1]
-         |  |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |  |     |     +- ArrayTypeDim[@Varargs = false]
          |  |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -112,7 +112,7 @@
          |        +- MethodCall[@CompileTimeConstant = false, @Image = "printf", @MethodName = "printf", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |           +- ArgumentList[@Empty = false, @Size = 2]
          |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "NumLetters: %d%n", @Empty = false, @Image = "\"NumLetters: %d%n\"", @Length = 16, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "numLetters", @Name = "numLetters", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SwitchExpressions.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SwitchExpressions.txt
index db6db100ef..77f21d244c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SwitchExpressions.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SwitchExpressions.txt
@@ -39,19 +39,19 @@
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |  |     +- ArrayType[@ArrayDepth = 1]
-         |  |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |  |     |     +- ArrayTypeDim[@Varargs = false]
          |  |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 15, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Day"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Day"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "day"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "day", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "THURSDAY", @Name = "THURSDAY", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Day"]
+         |     |           +- ClassType[@FullyQualified = false, @SimpleName = "Day"]
          |     +- SwitchStatement[@DefaultCase = false, @EnumSwitch = true, @ExhaustiveEnumSwitch = true, @FallthroughSwitch = false]
          |     |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "day", @Name = "day", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  +- SwitchArrowBranch[@Default = false]
@@ -62,7 +62,7 @@
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |        +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "6", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 6.0, @ValueAsFloat = 6.0, @ValueAsInt = 6, @ValueAsLong = 6]
          |     |  +- SwitchArrowBranch[@Default = false]
@@ -71,7 +71,7 @@
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |        +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "7", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 7.0, @ValueAsFloat = 7.0, @ValueAsInt = 7, @ValueAsLong = 7]
          |     |  +- SwitchArrowBranch[@Default = false]
@@ -81,7 +81,7 @@
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |        +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "8", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 8.0, @ValueAsFloat = 8.0, @ValueAsInt = 8, @ValueAsLong = 8]
          |     |  +- SwitchArrowBranch[@Default = false]
@@ -90,7 +90,7 @@
          |     |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "9", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 9.0, @ValueAsFloat = 9.0, @ValueAsInt = 9, @ValueAsLong = 9]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -123,7 +123,7 @@
          |     |  +- MethodCall[@CompileTimeConstant = false, @Image = "printf", @MethodName = "printf", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |     +- ArgumentList[@Empty = false, @Size = 2]
          |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "numLetters=%d%n", @Empty = false, @Image = "\"numLetters=%d%n\"", @Length = 15, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "numLetters", @Name = "numLetters", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -193,13 +193,13 @@
          |     |  +- MethodCall[@CompileTimeConstant = false, @Image = "printf", @MethodName = "printf", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |     +- ArgumentList[@Empty = false, @Size = 2]
          |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "j=%d%n", @Empty = false, @Image = "\"j=%d%n\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "j", @Name = "j", @ParenthesisDepth = 0, @Parenthesized = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "s"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Foo", @Empty = false, @Image = "\"Foo\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -226,14 +226,14 @@
          |     |        |  +- YieldStatement[]
          |     |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = true, @Image = "BAZ", @Name = "BAZ", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |        |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "SwitchExpressions"]
+         |     |        |           +- ClassType[@FullyQualified = false, @SimpleName = "SwitchExpressions"]
          |     |        +- SwitchFallthroughBranch[@Default = true]
          |     |           +- SwitchLabel[@Default = true]
          |     |           +- ExpressionStatement[]
          |     |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |           |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Neither Foo nor Bar, hmmm...", @Empty = false, @Image = "\"Neither Foo nor Bar, hmmm...\"", @Length = 28, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |           +- YieldStatement[]
@@ -242,7 +242,7 @@
          |        +- MethodCall[@CompileTimeConstant = false, @Image = "printf", @MethodName = "printf", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |           +- ArgumentList[@Empty = false, @Size = 2]
          |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "result=%d%n", @Empty = false, @Image = "\"result=%d%n\"", @Length = 11, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "result", @Name = "result", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -263,7 +263,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "one", @Empty = false, @Image = "\"one\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
@@ -272,7 +272,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "two", @Empty = false, @Image = "\"two\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -280,7 +280,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "many", @Empty = false, @Image = "\"many\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PRIVATE, @Final = false, @Image = "howManyExpr", @Name = "howManyExpr", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PRIVATE, @Void = true]
@@ -296,7 +296,7 @@
          |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |           +- ArgumentList[@Empty = false, @Size = 1]
          |              +- SwitchExpression[@CompileTimeConstant = false, @DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "k", @Name = "k", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SwitchRules.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SwitchRules.txt
index 6ecc571c2f..ea79ea2c48 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SwitchRules.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/SwitchRules.txt
@@ -51,7 +51,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -72,7 +72,7 @@
                   |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |     +- ArgumentList[@Empty = false, @Size = 1]
                   |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "  6", @Empty = false, @Image = "\"  6\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   +- SwitchArrowBranch[@Default = false]
@@ -81,7 +81,7 @@
                   |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |     +- ArgumentList[@Empty = false, @Size = 1]
                   |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "  7", @Empty = false, @Image = "\"  7\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   +- SwitchArrowBranch[@Default = false]
@@ -91,7 +91,7 @@
                   |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |     +- ArgumentList[@Empty = false, @Size = 1]
                   |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "  8", @Empty = false, @Image = "\"  8\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   +- SwitchArrowBranch[@Default = false]
@@ -102,12 +102,12 @@
                   |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |           +- ArgumentList[@Empty = false, @Size = 1]
                   |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "  9", @Empty = false, @Image = "\"  9\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   +- SwitchArrowBranch[@Default = true]
                      +- SwitchLabel[@Default = true]
                      +- ThrowStatement[]
                         +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-                           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
+                           +- ClassType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
                            +- ArgumentList[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/NonSealedIdentifier.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/NonSealedIdentifier.txt
index a8ef40fa40..24790fbda4 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/NonSealedIdentifier.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/NonSealedIdentifier.txt
@@ -9,7 +9,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -42,6 +42,6 @@
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "result", @Name = "result", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/TextBlocks.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/TextBlocks.txt
index 98fc8f1c87..ac2d75f5b1 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/TextBlocks.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/TextBlocks.txt
@@ -11,16 +11,16 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- ThrowsList[@Empty = false, @Size = 1]
-            |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Exception"]
+            |  +- ClassType[@FullyQualified = false, @SimpleName = "Exception"]
             +- Block[@Empty = false, @Size = 25, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "html"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "html", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "\n    \n        
Hello, world
\n    \n\n", @Empty = false, @Image = "\"\"\"\n                         \n                          \n                              
Hello, world
    \n                           \n                         \n                      \"\"\"", @Length = 66, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
@@ -28,12 +28,12 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "html", @Name = "html", @ParenthesisDepth = 0, @Parenthesized = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "query"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "query", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "SELECT `EMP_ID`, `LAST_NAME` FROM `EMPLOYEE_TB`\nWHERE `CITY` = \'INDIANAPOLIS\'\nORDER BY `EMP_ID`, `LAST_NAME`;\n", @Empty = false, @Image = "\"\"\"\n                       SELECT `EMP_ID`, `LAST_NAME` FROM `EMPLOYEE_TB`\n                       WHERE `CITY` = \'INDIANAPOLIS\'\n                       ORDER BY `EMP_ID`, `LAST_NAME`;\n                       \"\"\"", @Length = 110, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
@@ -41,23 +41,23 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "query", @Name = "query", @ParenthesisDepth = 0, @Parenthesized = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ScriptEngine"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "ScriptEngine"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "engine"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "engine", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- MethodCall[@CompileTimeConstant = false, @Image = "getEngineByName", @MethodName = "getEngineByName", @ParenthesisDepth = 0, @Parenthesized = false]
                |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ScriptEngineManager"]
+               |        |  +- ClassType[@FullyQualified = false, @SimpleName = "ScriptEngineManager"]
                |        |  +- ArgumentList[@Empty = true, @Size = 0]
                |        +- ArgumentList[@Empty = false, @Size = 1]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "js", @Empty = false, @Image = "\"js\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "obj"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- MethodCall[@CompileTimeConstant = false, @Image = "eval", @MethodName = "eval", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -66,7 +66,7 @@
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "function hello() {\n    print(\'\"Hello, world\"\');\n}\n\nhello();\n", @Empty = false, @Image = "\"\"\"\n                                 function hello() {\n                                     print(\'\"Hello, world\"\');\n                                 }\n                                 \n                                 hello();\n                                 \"\"\"", @Length = 60, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "htmlWithEscapes"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "htmlWithEscapes", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "\r\n    \r\n        
Hello, world
\r\n    \r\n\r\n", @Empty = false, @Image = "\"\"\"\n                      \\r\n                          \\r\n                              
Hello, world
\\r\n                          \\r\n                      \\r\n                      \"\"\"", @Length = 71, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
@@ -74,66 +74,66 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "htmlWithEscapes", @Name = "htmlWithEscapes", @ParenthesisDepth = 0, @Parenthesized = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "season"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "season", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "winter", @Empty = false, @Image = "\"\"\"\n                winter\"\"\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "period"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "period", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "winter\n", @Empty = false, @Image = "\"\"\"\n                        winter\n                        \"\"\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "greeting"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "greeting", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Hi, \"Bob\"\n", @Empty = false, @Image = "\"\"\"\n            Hi, \"Bob\"\n            \"\"\"", @Length = 10, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "salutation"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "salutation", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Hi,\n \"Bob\"\n", @Empty = false, @Image = "\"\"\"\n            Hi,\n             \"Bob\"\n            \"\"\"", @Length = 11, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "empty"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "empty", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "", @Empty = true, @Image = "\"\"\"\n                       \"\"\"", @Length = 0, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "quote"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "quote", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "\"\n", @Empty = false, @Image = "\"\"\"\n                       \"\n                       \"\"\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "backslash"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "backslash", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "\\\n", @Empty = false, @Image = "\"\"\"\n                           \\\\\n                           \"\"\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "normalStringLiteral"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "normalStringLiteral", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "test", @Empty = false, @Image = "\"test\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "code"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "code", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String text = \"\"\"\n    A text block inside a text block\n\"\"\";\n", @Empty = false, @Image = "\"\"\"\n            String text = \\\"\"\"\n                A text block inside a text block\n            \\\"\"\";\n            \"\"\"", @Length = 60, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "text"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "text", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", @Empty = false, @Image = "\"\"\"\n                      Lorem ipsum dolor sit amet, consectetur adipiscing \\\n                      elit, sed do eiusmod tempor incididunt ut labore \\\n                      et dolore magna aliqua.\\\n                      \"\"\"", @Length = 123, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
@@ -141,12 +141,12 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "text", @Name = "text", @ParenthesisDepth = 0, @Parenthesized = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "colors"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "colors", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "red   \ngreen \nblue  \n", @Empty = false, @Image = "\"\"\"\n                        red  \\s\n                        green\\s\n                        blue \\s\n                        \"\"\"", @Length = 21, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
@@ -154,12 +154,12 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "colors", @Name = "colors", @ParenthesisDepth = 0, @Parenthesized = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "emptyLine"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "emptyLine", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "\ntest\n", @Empty = false, @Image = "\"\"\"\n\ntest\n\"\"\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
@@ -167,7 +167,7 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- MethodCall[@CompileTimeConstant = false, @Image = "replaceAll", @MethodName = "replaceAll", @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "emptyLine", @Name = "emptyLine", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -176,7 +176,7 @@
                |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "", @Empty = false, @Image = "\"\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "bs"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "bs", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "\\test\n", @Empty = false, @Image = "\"\"\"\n                \\\\test\n                \"\"\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = true]
@@ -184,7 +184,7 @@
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- MethodCall[@CompileTimeConstant = false, @Image = "replaceAll", @MethodName = "replaceAll", @ParenthesisDepth = 0, @Parenthesized = false]
                            +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bs", @Name = "bs", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/LocalRecords.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/LocalRecords.txt
index eea038a8ff..5962512fa1 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/LocalRecords.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/LocalRecords.txt
@@ -13,7 +13,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 2]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Merchant"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Merchant"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "merchant", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -24,15 +24,15 @@
          |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "month", @Name = "month", @ParenthesisDepth = 0, @Parenthesized = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 2, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "findTopMerchants", @Name = "findTopMerchants", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "List"]
          |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Merchant"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Merchant"]
          |  +- FormalParameters[@Empty = false, @Size = 2]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "List"]
          |  |  |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Merchant"]
+         |  |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Merchant"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "merchants", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -45,7 +45,7 @@
          |     |     +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |     |     |  +- RecordComponent[@EffectiveVisibility = Visibility.V_LOCAL, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |     |     |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |     |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Merchant"]
+         |     |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Merchant"]
          |     |     |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "merchant", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |     |     |  +- RecordComponent[@EffectiveVisibility = Visibility.V_LOCAL, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |     |     |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
@@ -67,7 +67,7 @@
          |           |  |  |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |           |  |  |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "merchant", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = true, @Visibility = Visibility.V_PACKAGE]
          |           |  |  |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |           |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MerchantSales"]
+         |           |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "MerchantSales"]
          |           |  |  |           +- ArgumentList[@Empty = false, @Size = 2]
          |           |  |  |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "merchant", @Name = "merchant", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  |  |              +- MethodCall[@CompileTimeConstant = false, @Image = "computeSales", @MethodName = "computeSales", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -85,7 +85,7 @@
          |           |  |        |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = true, @LocalVariable = false, @Name = "m2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = true, @Visibility = Visibility.V_PACKAGE]
          |           |  |        +- MethodCall[@CompileTimeConstant = false, @Image = "compare", @MethodName = "compare", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  |           +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |  |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Double"]
+         |           |  |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Double"]
          |           |  |           +- ArgumentList[@Empty = false, @Size = 2]
          |           |  |              +- MethodCall[@CompileTimeConstant = false, @Image = "sales", @MethodName = "sales", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  |              |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "m2", @Name = "m2", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -96,11 +96,11 @@
          |           |  +- ArgumentList[@Empty = false, @Size = 1]
          |           |     +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = false, @MethodName = "merchant", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MerchantSales"]
+         |           |           +- ClassType[@FullyQualified = false, @SimpleName = "MerchantSales"]
          |           +- ArgumentList[@Empty = false, @Size = 1]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "toList", @MethodName = "toList", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Collectors"]
+         |                 |  +- ClassType[@FullyQualified = false, @SimpleName = "Collectors"]
          |                 +- ArgumentList[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "methodWithLocalRecordAndModifiers", @Name = "methodWithLocalRecordAndModifiers", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
          |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -113,7 +113,7 @@
          |     |     +- RecordComponentList[@Empty = false, @Size = 1, @Varargs = false]
          |     |     |  +- RecordComponent[@EffectiveVisibility = Visibility.V_LOCAL, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |     |     |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |     |     +- RecordBody[@Empty = true, @Size = 0]
          |     +- LocalClassStatement[]
@@ -122,29 +122,29 @@
          |     |     +- RecordComponentList[@Empty = false, @Size = 1, @Varargs = false]
          |     |     |  +- RecordComponent[@EffectiveVisibility = Visibility.V_LOCAL, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |     |     |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |     |     +- RecordBody[@Empty = true, @Size = 0]
          |     +- LocalClassStatement[]
          |     |  +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "LocalRecords$1MyRecord3", @CanonicalName = null, @EffectiveVisibility = Visibility.V_LOCAL, @Enum = false, @Final = true, @Interface = false, @Local = true, @Nested = false, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "MyRecord3", @Static = true, @TopLevel = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{}"]
          |     |     |  +- Annotation[@SimpleName = "Deprecated"]
-         |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Deprecated"]
+         |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Deprecated"]
          |     |     +- RecordComponentList[@Empty = false, @Size = 1, @Varargs = false]
          |     |     |  +- RecordComponent[@EffectiveVisibility = Visibility.V_LOCAL, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |     |     |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |     |     +- RecordBody[@Empty = true, @Size = 0]
          |     +- LocalClassStatement[]
          |        +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "LocalRecords$1MyRecord4", @CanonicalName = null, @EffectiveVisibility = Visibility.V_LOCAL, @Enum = false, @Final = true, @Interface = false, @Local = true, @Nested = false, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "MyRecord4", @Static = true, @TopLevel = false, @Visibility = Visibility.V_LOCAL]
          |           +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{static, final}"]
          |           |  +- Annotation[@SimpleName = "Deprecated"]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Deprecated"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "Deprecated"]
          |           +- RecordComponentList[@Empty = false, @Size = 1, @Varargs = false]
          |           |  +- RecordComponent[@EffectiveVisibility = Visibility.V_LOCAL, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |           |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |           +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "methodWithLocalClass", @Name = "methodWithLocalClass", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -189,6 +189,6 @@
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "result", @Name = "result", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/NonSealedIdentifier.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/NonSealedIdentifier.txt
index a8ef40fa40..24790fbda4 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/NonSealedIdentifier.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/NonSealedIdentifier.txt
@@ -9,7 +9,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -42,6 +42,6 @@
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "result", @Name = "result", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/PatternMatchingInstanceof.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/PatternMatchingInstanceof.txt
index f56bea27da..bce79187d7 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/PatternMatchingInstanceof.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/PatternMatchingInstanceof.txt
@@ -14,7 +14,7 @@
       +- ClassOrInterfaceBody[@Empty = false, @Size = 5]
          +- FieldDeclaration[@EffectiveVisibility = Visibility.V_PRIVATE, @Static = false, @Visibility = Visibility.V_PRIVATE]
          |  +- ModifierList[@EffectiveModifiers = "{private}", @ExplicitModifiers = "{private}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  +- VariableDeclarator[@Initializer = true, @Name = "s"]
          |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = true, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "other string", @Empty = false, @Image = "\"other string\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -25,7 +25,7 @@
          |  +- Block[@Empty = false, @Size = 8, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "obj"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "abc", @Empty = false, @Image = "\"abc\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -35,14 +35,14 @@
          |     |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- Block[@Empty = false, @Size = 3, @containsComment = false]
          |     |  |  +- ExpressionStatement[]
          |     |  |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |  |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a) obj == s: ", @Empty = false, @Image = "\"a) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -57,7 +57,7 @@
          |     |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -73,7 +73,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "b) obj == s: ", @Empty = false, @Image = "\"b) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -87,14 +87,14 @@
          |     |  |     +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- Block[@Empty = false, @Size = 1, @containsComment = true]
          |     |  |  +- ExpressionStatement[]
          |     |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "c) obj == s: ", @Empty = false, @Image = "\"c) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -106,7 +106,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "d) obj == s: ", @Empty = false, @Image = "\"d) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -120,7 +120,7 @@
          |     |  |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -132,7 +132,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "e) obj == s: ", @Empty = false, @Image = "\"e) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -146,7 +146,7 @@
          |     |  |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -158,7 +158,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "f) obj == s: ", @Empty = false, @Image = "\"f) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -171,14 +171,14 @@
          |     |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |        +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
-         |     |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- Block[@Empty = false, @Size = 1, @containsComment = true]
          |     |  |  +- ExpressionStatement[]
          |     |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "g) obj == s: ", @Empty = false, @Image = "\"g) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -190,7 +190,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "h) obj == s: ", @Empty = false, @Image = "\"h) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -204,15 +204,15 @@
          |     |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |     |  |        |  +- Annotation[@SimpleName = "Deprecated"]
-         |     |  |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Deprecated"]
-         |     |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Deprecated"]
+         |     |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- Block[@Empty = false, @Size = 1, @containsComment = true]
          |     |  |  +- ExpressionStatement[]
          |     |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "i) obj == s: ", @Empty = false, @Image = "\"i) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -224,7 +224,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "j) obj == s: ", @Empty = false, @Image = "\"j) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -238,15 +238,15 @@
          |        |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |        +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
          |        |        |  +- Annotation[@SimpleName = "Deprecated"]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Deprecated"]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Deprecated"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = true]
          |        |  +- ExpressionStatement[]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "k) obj == s: ", @Empty = false, @Image = "\"k) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -258,7 +258,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "l) obj == s: ", @Empty = false, @Image = "\"l) obj == s: \"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -272,7 +272,7 @@
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |  |     +- ArrayType[@ArrayDepth = 1]
-         |  |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |  |     |     +- ArrayTypeDim[@Varargs = false]
          |  |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -280,7 +280,7 @@
          |     +- ExpressionStatement[]
          |        +- MethodCall[@CompileTimeConstant = false, @Image = "test", @MethodName = "test", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "PatternMatchingInstanceof"]
+         |           |  +- ClassType[@FullyQualified = false, @SimpleName = "PatternMatchingInstanceof"]
          |           |  +- ArgumentList[@Empty = true, @Size = 0]
          |           +- ArgumentList[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "PatternMatchingInstanceof$Foo", @CanonicalName = "PatternMatchingInstanceof.Foo", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Foo", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -290,28 +290,28 @@
          |        +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |           +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |           |  +- VariableDeclarator[@Initializer = true, @Name = "f"]
          |           |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "f", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |     +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |              +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |              +- VariableDeclarator[@Initializer = true, @Name = "o"]
          |                 +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |                 +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.INSTANCEOF, @ParenthesisDepth = 0, @Parenthesized = false]
          |                    +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "f", @Name = "f", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                       +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Foo"]
+         |                       +- ClassType[@FullyQualified = false, @SimpleName = "Foo"]
          |                          +- Annotation[@SimpleName = "Nullable"]
-         |                             +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Nullable"]
+         |                             +- ClassType[@FullyQualified = false, @SimpleName = "Nullable"]
          +- AnnotationTypeDeclaration[@Abstract = true, @Annotation = true, @Anonymous = false, @BinaryName = "PatternMatchingInstanceof$Nullable", @CanonicalName = "PatternMatchingInstanceof.Nullable", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "Nullable", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
             +- ModifierList[@EffectiveModifiers = "{abstract, static}", @ExplicitModifiers = "{}"]
             |  +- Annotation[@SimpleName = "Target"]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Target"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "Target"]
             |     +- AnnotationMemberList[@Empty = false, @Size = 1]
             |        +- MemberValuePair[@Image = "value", @Name = "value", @Shorthand = false]
             |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "TYPE_USE", @Name = "TYPE_USE", @ParenthesisDepth = 0, @Parenthesized = false]
             |              +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-            |                 +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ElementType"]
+            |                 +- ClassType[@FullyQualified = false, @SimpleName = "ElementType"]
             +- AnnotationTypeBody[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Point.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Point.txt
index 4a78b8d9d3..28210f2f8f 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Point.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Point.txt
@@ -18,18 +18,18 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 2, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "p"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+               |        +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
                |        +- ArgumentList[@Empty = false, @Size = 2]
                |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "1", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 1.0, @ValueAsFloat = 1.0, @ValueAsInt = 1, @ValueAsLong = 1]
                |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
@@ -37,7 +37,7 @@
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                            +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "p = ", @Empty = false, @Image = "\"p = \"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Records.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Records.txt
index d3cfa13e84..edbf6f8b23 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Records.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Records.txt
@@ -9,26 +9,26 @@
          +- AnnotationTypeDeclaration[@Abstract = true, @Annotation = true, @Anonymous = false, @BinaryName = "Records$Nullable", @CanonicalName = "Records.Nullable", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "Nullable", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{abstract, static}", @ExplicitModifiers = "{}"]
          |  |  +- Annotation[@SimpleName = "Target"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Target"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Target"]
          |  |     +- AnnotationMemberList[@Empty = false, @Size = 1]
          |  |        +- MemberValuePair[@Image = "value", @Name = "value", @Shorthand = true]
          |  |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "TYPE_USE", @Name = "TYPE_USE", @ParenthesisDepth = 0, @Parenthesized = false]
          |  |              +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |  |                 +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ElementType"]
+         |  |                 +- ClassType[@FullyQualified = false, @SimpleName = "ElementType"]
          |  +- AnnotationTypeBody[@Empty = true, @Size = 0]
          +- AnnotationTypeDeclaration[@Abstract = true, @Annotation = true, @Anonymous = false, @BinaryName = "Records$MyAnnotation", @CanonicalName = "Records.MyAnnotation", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "MyAnnotation", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{abstract, static}", @ExplicitModifiers = "{}"]
          |  |  +- Annotation[@SimpleName = "Target"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Target"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Target"]
          |  |     +- AnnotationMemberList[@Empty = false, @Size = 1]
          |  |        +- MemberValuePair[@Image = "value", @Name = "value", @Shorthand = true]
          |  |           +- MemberValueArrayInitializer[]
          |  |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "CONSTRUCTOR", @Name = "CONSTRUCTOR", @ParenthesisDepth = 0, @Parenthesized = false]
          |  |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |  |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ElementType"]
+         |  |              |     +- ClassType[@FullyQualified = false, @SimpleName = "ElementType"]
          |  |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "PARAMETER", @Name = "PARAMETER", @ParenthesisDepth = 0, @Parenthesized = false]
          |  |                 +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |  |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ElementType"]
+         |  |                    +- ClassType[@FullyQualified = false, @SimpleName = "ElementType"]
          |  +- AnnotationTypeBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Records$MyComplex", @CanonicalName = "Records.MyComplex", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "MyComplex", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PUBLIC]
          |  +- ModifierList[@EffectiveModifiers = "{public, static, final}", @ExplicitModifiers = "{public}"]
@@ -40,19 +40,19 @@
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
          |  |     |  +- Annotation[@SimpleName = "Deprecated"]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Deprecated"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Deprecated"]
          |  |     +- PrimitiveType[@Kind = PrimitiveTypeKind.INT]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "imaginary", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = false, @Size = 3]
          |     +- ConstructorDeclaration[@Abstract = false, @Arity = 2, @EffectiveVisibility = Visibility.V_PUBLIC, @Image = "MyComplex", @Name = "MyComplex", @Varargs = false, @Visibility = Visibility.V_PUBLIC, @containsComment = false]
          |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
          |     |  |  +- Annotation[@SimpleName = "MyAnnotation"]
-         |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
+         |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
          |     |  +- FormalParameters[@Empty = false, @Size = 2]
          |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |     |  |  |  |  +- Annotation[@SimpleName = "MyAnnotation"]
-         |     |  |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
+         |     |  |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
          |     |  |  |  +- PrimitiveType[@Kind = PrimitiveTypeKind.INT]
          |     |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "real", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
@@ -66,7 +66,7 @@
          |     |     |  |  +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "100", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 100.0, @ValueAsFloat = 100.0, @ValueAsInt = 100, @ValueAsLong = 100]
          |     |     |  +- ThrowStatement[]
          |     |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
+         |     |     |        +- ClassType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
          |     |     |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "too big", @Empty = false, @Image = "\"too big\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |     +- ExpressionStatement[]
@@ -105,7 +105,7 @@
          |     +- CompactConstructorDeclaration[@EffectiveVisibility = Visibility.V_PUBLIC, @Image = "Range", @Visibility = Visibility.V_PUBLIC]
          |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
          |     |  |  +- Annotation[@SimpleName = "MyAnnotation"]
-         |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
+         |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
          |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     |     +- IfStatement[@Else = false]
          |     |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -113,11 +113,11 @@
          |     |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "hi", @Name = "hi", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- ThrowStatement[]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
+         |     |              +- ClassType[@FullyQualified = false, @SimpleName = "IllegalArgumentException"]
          |     |              +- ArgumentList[@Empty = false, @Size = 1]
          |     |                 +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                    +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |                    |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |                    |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |                    +- ArgumentList[@Empty = false, @Size = 3]
          |     |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "(%d,%d)", @Empty = false, @Image = "\"(%d,%d)\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |                       +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "lo", @Name = "lo", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -132,7 +132,7 @@
          |  +- RecordComponentList[@Empty = false, @Size = 1, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "foo", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = false, @Size = 1]
          |     +- CompactConstructorDeclaration[@EffectiveVisibility = Visibility.V_PUBLIC, @Image = "RecordWithLambdaInCompactConstructor", @Visibility = Visibility.V_PUBLIC]
@@ -141,7 +141,7 @@
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "requireNonNull", @MethodName = "requireNonNull", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Objects"]
+         |                 |  +- ClassType[@FullyQualified = false, @SimpleName = "Objects"]
          |                 +- ArgumentList[@Empty = false, @Size = 2]
          |                    +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "foo", @Name = "foo", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    +- LambdaExpression[@Arity = 0, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -153,15 +153,15 @@
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = true, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
          |  |     |  +- Annotation[@SimpleName = "Nullable"]
-         |  |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Nullable"]
+         |  |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Nullable"]
          |  |     |  +- Annotation[@SimpleName = "Deprecated"]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Deprecated"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Deprecated"]
          |  |     +- ArrayType[@ArrayDepth = 1]
-         |  |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |  |     |     +- ArrayTypeDim[@Varargs = true]
          |  |     |        +- Annotation[@SimpleName = "Nullable"]
-         |  |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Nullable"]
+         |  |     |           +- ClassType[@FullyQualified = false, @SimpleName = "Nullable"]
          |  |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Records$ArrayRec", @CanonicalName = "Records.ArrayRec", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "ArrayRec", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PUBLIC]
@@ -188,7 +188,7 @@
          |     |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
          |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "bar", @Name = "bar", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
          |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Type"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Type"]
          |     |  +- FormalParameters[@Empty = true, @Size = 0]
          |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     |     +- ReturnStatement[]
@@ -200,20 +200,20 @@
          |        +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |           +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "EmptyRec"]
+         |           |  +- ClassType[@FullyQualified = false, @SimpleName = "EmptyRec"]
          |           |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |  +- VariableDeclarator[@Initializer = true, @Name = "r"]
          |           |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = true, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "EmptyRec"]
+         |           |        +- ClassType[@FullyQualified = false, @SimpleName = "EmptyRec"]
          |           |        |  +- TypeArguments[@Diamond = true, @Empty = true, @Size = 0]
          |           |        +- ArgumentList[@Empty = true, @Size = 0]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "Records$Person", @CanonicalName = "Records.Person", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "Person", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PUBLIC]
@@ -221,24 +221,24 @@
          |  +- ClassOrInterfaceBody[@Empty = false, @Size = 2]
          |     +- MethodDeclaration[@Abstract = true, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "firstName", @Name = "firstName", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
          |     |  +- ModifierList[@EffectiveModifiers = "{public, abstract}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- FormalParameters[@Empty = true, @Size = 0]
          |     +- MethodDeclaration[@Abstract = true, @Arity = 0, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "lastName", @Name = "lastName", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
          |        +- ModifierList[@EffectiveModifiers = "{public, abstract}", @ExplicitModifiers = "{}"]
-         |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        +- FormalParameters[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Records$PersonRecord", @CanonicalName = "Records.PersonRecord", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "PersonRecord", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PUBLIC]
             +- ModifierList[@EffectiveModifiers = "{public, static, final}", @ExplicitModifiers = "{public}"]
             +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
             |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
             |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-            |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "firstName", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
             |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
             |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lastName", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
             +- ImplementsList[@Empty = false, @Size = 2]
-            |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Person"]
-            |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Serializable"]
+            |  +- ClassType[@FullyQualified = false, @SimpleName = "Person"]
+            |  +- ClassType[@FullyQualified = true, @SimpleName = "Serializable"]
             +- RecordBody[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/LocalVars.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/LocalVars.txt
index fa5bcb3e90..b8c9dded3b 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/LocalVars.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/LocalVars.txt
@@ -9,7 +9,7 @@
             +- Block[@Empty = false, @Size = 2, @containsComment = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "sealed"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "sealed", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/SealedInnerClasses.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/SealedInnerClasses.txt
index 3cd4ed3bb9..aaf98b6536 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/SealedInnerClasses.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/SealedInnerClasses.txt
@@ -5,22 +5,22 @@
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "SealedInnerClasses$Square", @CanonicalName = "SealedInnerClasses.Square", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Square", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{sealed}", @ExplicitModifiers = "{sealed}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Squircle"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Squircle"]
          |  +- ClassOrInterfaceBody[@Empty = false, @Size = 2]
          |     +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "SealedInnerClasses$Square$OtherSquare", @CanonicalName = "SealedInnerClasses.Square.OtherSquare", @EffectiveVisibility = Visibility.V_PRIVATE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "OtherSquare", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PRIVATE]
          |     |  +- ModifierList[@EffectiveModifiers = "{private, non-sealed}", @ExplicitModifiers = "{private, non-sealed}"]
          |     |  +- ExtendsList[@Empty = false, @Size = 1]
-         |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Square"]
+         |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Square"]
          |     |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          |     +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "SealedInnerClasses$Square$StaticClass", @CanonicalName = "SealedInnerClasses.Square.StaticClass", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "StaticClass", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |        +- ModifierList[@EffectiveModifiers = "{non-sealed, static}", @ExplicitModifiers = "{non-sealed, static}"]
          |        +- ImplementsList[@Empty = false, @Size = 1]
-         |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Squircle"]
+         |        |  +- ClassType[@FullyQualified = false, @SimpleName = "Squircle"]
          |        +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "SealedInnerClasses$Squircle", @CanonicalName = "SealedInnerClasses.Squircle", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "Squircle", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
             +- ModifierList[@EffectiveModifiers = "{sealed, abstract, static}", @ExplicitModifiers = "{sealed}"]
             +- PermitsList[@Empty = false, @Size = 2]
-            |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Square"]
-            |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "StaticClass"]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Square"]
+            |  +- ClassType[@FullyQualified = false, @SimpleName = "Square"]
+            |  +- ClassType[@FullyQualified = false, @SimpleName = "StaticClass"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "Square"]
             +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/expression/Expr.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/expression/Expr.txt
index f61143c450..704b8b3308 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/expression/Expr.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/expression/Expr.txt
@@ -4,8 +4,8 @@
    +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "com.example.expression.Expr", @CanonicalName = "com.example.expression.Expr", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = false, @PackageName = "com.example.expression", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "Expr", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PUBLIC]
       +- ModifierList[@EffectiveModifiers = "{public, sealed, abstract}", @ExplicitModifiers = "{public, sealed}"]
       +- PermitsList[@Empty = false, @Size = 4]
-      |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ConstantExpr"]
-      |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "PlusExpr"]
-      |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "TimesExpr"]
-      |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NegExpr"]
+      |  +- ClassType[@FullyQualified = false, @SimpleName = "ConstantExpr"]
+      |  +- ClassType[@FullyQualified = false, @SimpleName = "PlusExpr"]
+      |  +- ClassType[@FullyQualified = false, @SimpleName = "TimesExpr"]
+      |  +- ClassType[@FullyQualified = false, @SimpleName = "NegExpr"]
       +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Shape.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Shape.txt
index 646a73d524..12c1516aa8 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Shape.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Shape.txt
@@ -4,7 +4,7 @@
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "com.example.geometry.Shape", @CanonicalName = "com.example.geometry.Shape", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "com.example.geometry", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Shape", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PUBLIC]
       +- ModifierList[@EffectiveModifiers = "{public, sealed}", @ExplicitModifiers = "{public, sealed}"]
       +- PermitsList[@Empty = false, @Size = 3]
-      |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Circle"]
-      |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
-      |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Square"]
+      |  +- ClassType[@FullyQualified = false, @SimpleName = "Circle"]
+      |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
+      |  +- ClassType[@FullyQualified = false, @SimpleName = "Square"]
       +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Square.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Square.txt
index d8fd2694b1..d1545654bd 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Square.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Square.txt
@@ -4,5 +4,5 @@
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "com.example.geometry.Square", @CanonicalName = "com.example.geometry.Square", @EffectiveVisibility = Visibility.V_PUBLIC, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "com.example.geometry", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Square", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PUBLIC]
       +- ModifierList[@EffectiveModifiers = "{public, non-sealed}", @ExplicitModifiers = "{public, non-sealed}"]
       +- ExtendsList[@Empty = false, @Size = 1]
-      |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+      |  +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
       +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/DealingWithNull.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/DealingWithNull.txt
index 9a07d342b0..e9e24cad1d 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/DealingWithNull.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/DealingWithNull.txt
@@ -8,7 +8,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -19,7 +19,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Oops", @Empty = false, @Image = "\"Oops\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
@@ -29,7 +29,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Great", @Empty = false, @Image = "\"Great\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -37,7 +37,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Ok", @Empty = false, @Image = "\"Ok\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testStringOrNull", @Name = "testStringOrNull", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -46,7 +46,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -55,12 +55,12 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String: ", @Empty = false, @Image = "\"String: \"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -71,7 +71,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null", @Empty = false, @Image = "\"null\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -79,7 +79,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testStringOrDefaultNull", @Name = "testStringOrDefaultNull", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -88,7 +88,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -97,12 +97,12 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String: ", @Empty = false, @Image = "\"String: \"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -113,7 +113,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null or default case", @Empty = false, @Image = "\"null or default case\"", @Length = 20, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "test2", @Name = "test2", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -122,7 +122,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -132,18 +132,18 @@
          |        |  |  +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- ThrowStatement[]
          |        |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NullPointerException"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "NullPointerException"]
          |        |        +- ArgumentList[@Empty = true, @Size = 0]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String: ", @Empty = false, @Image = "\"String: \"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -152,12 +152,12 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Integer", @Empty = false, @Image = "\"Integer\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -165,7 +165,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default", @Empty = false, @Image = "\"default\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "test3", @Name = "test3", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -174,7 +174,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 4, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -186,7 +186,7 @@
          |     |  |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null", @Empty = false, @Image = "\"null\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  |  +- BreakStatement[@Label = null]
@@ -194,13 +194,13 @@
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- ExpressionStatement[]
          |     |  |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String", @Empty = false, @Image = "\"String\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  |  +- BreakStatement[@Label = null]
@@ -210,7 +210,7 @@
          |     |     |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |     |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |     +- BreakStatement[@Label = null]
@@ -222,19 +222,19 @@
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null", @Empty = false, @Image = "\"null\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  +- SwitchArrowBranch[@Default = false]
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String", @Empty = false, @Image = "\"String\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  +- SwitchArrowBranch[@Default = true]
@@ -242,7 +242,7 @@
          |     |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -256,7 +256,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "The rest (including null)", @Empty = false, @Image = "\"The rest (including null)\"", @Length = 25, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -267,7 +267,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "The rest (including null)", @Empty = false, @Image = "\"The rest (including null)\"", @Length = 25, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -277,7 +277,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -299,14 +299,14 @@
                |  +- CatchClause[]
                |     +- CatchParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Multicatch = false, @Name = "e", @Visibility = Visibility.V_PACKAGE]
                |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NullPointerException"]
+               |     |  +- ClassType[@FullyQualified = false, @SimpleName = "NullPointerException"]
                |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = true, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "e", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
                |     +- Block[@Empty = false, @Size = 1, @containsComment = false]
                |        +- ExpressionStatement[]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "e", @Name = "e", @ParenthesisDepth = 0, @Parenthesized = false]
                +- ExpressionStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/EnhancedTypeCheckingSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/EnhancedTypeCheckingSwitch.txt
index 32164ba664..258a608eec 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/EnhancedTypeCheckingSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/EnhancedTypeCheckingSwitch.txt
@@ -8,7 +8,7 @@
    |     |  +- FormalParameters[@Empty = false, @Size = 1]
    |     |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |     |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |     |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -19,31 +19,31 @@
    |     |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |        |     +- ArgumentList[@Empty = false, @Size = 1]
    |     |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null", @Empty = false, @Image = "\"null\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |        +- SwitchArrowBranch[@Default = false]
    |     |        |  +- SwitchLabel[@Default = false]
    |     |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
    |     |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |     |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |     |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |        |     +- ArgumentList[@Empty = false, @Size = 1]
    |     |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String", @Empty = false, @Image = "\"String\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     |        +- SwitchArrowBranch[@Default = false]
    |     |        |  +- SwitchLabel[@Default = false]
    |     |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
    |     |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+   |     |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
    |     |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |        |     +- ArgumentList[@Empty = false, @Size = 1]
    |     |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -57,12 +57,12 @@
    |     |        |  +- SwitchLabel[@Default = false]
    |     |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
    |     |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |     |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+   |     |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
    |     |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |     |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |        |     +- ArgumentList[@Empty = false, @Size = 1]
    |     |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Record class: ", @Empty = false, @Image = "\"Record class: \"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -81,7 +81,7 @@
    |     |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |        |     +- ArgumentList[@Empty = false, @Size = 1]
    |     |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
    |     |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Array of ints of length ", @Empty = false, @Image = "\"Array of ints of length \"", @Length = 24, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -92,7 +92,7 @@
    |     |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
    |     |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |     |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+   |     |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
    |     |              +- ArgumentList[@Empty = false, @Size = 1]
    |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Something else", @Empty = false, @Image = "\"Something else\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
    |     +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -102,14 +102,14 @@
    |        |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
    |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |        |     +- ArrayType[@ArrayDepth = 1]
-   |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |        |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
    |        |     |     +- ArrayTypeDim[@Varargs = false]
    |        |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |        +- Block[@Empty = false, @Size = 9, @containsComment = false]
    |           +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |           |  +- VariableDeclarator[@Initializer = true, @Name = "o"]
    |           |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
    |           |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "test", @Empty = false, @Image = "\"test\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -122,7 +122,7 @@
    |           |     +- ArgumentList[@Empty = false, @Size = 1]
    |           |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "BLUE", @Name = "BLUE", @ParenthesisDepth = 0, @Parenthesized = false]
    |           |           +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-   |           |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+   |           |              +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
    |           +- ExpressionStatement[]
    |           |  +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
    |           |     +- VariableAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "o", @Name = "o", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -144,7 +144,7 @@
    |           |  +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
    |           |     +- VariableAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "o", @Name = "o", @ParenthesisDepth = 0, @Parenthesized = false]
    |           |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+   |           |        +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
    |           |        +- ArgumentList[@Empty = false, @Size = 2]
    |           |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "7", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 7.0, @ValueAsFloat = 7.0, @ValueAsInt = 7, @ValueAsLong = 7]
    |           |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "8", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 8.0, @ValueAsFloat = 8.0, @ValueAsInt = 8, @ValueAsLong = 8]
@@ -156,7 +156,7 @@
    |           |  +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
    |           |     +- VariableAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "o", @Name = "o", @ParenthesisDepth = 0, @Parenthesized = false]
    |           |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-   |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+   |           |        +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
    |           |        +- ArgumentList[@Empty = true, @Size = 0]
    |           +- ExpressionStatement[]
    |              +- MethodCall[@CompileTimeConstant = false, @Image = "typeTester", @MethodName = "typeTester", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/ExhaustiveSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/ExhaustiveSwitch.txt
index 8823614db4..71ca8af9fe 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/ExhaustiveSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/ExhaustiveSwitch.txt
@@ -8,7 +8,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ReturnStatement[]
@@ -18,7 +18,7 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |     +- AmbiguousName[@CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -27,7 +27,7 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- SwitchArrowBranch[@Default = true]
@@ -39,7 +39,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -48,13 +48,13 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- ExpressionStatement[]
          |        |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- BreakStatement[@Label = null]
@@ -62,13 +62,13 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- ExpressionStatement[]
          |        |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Integer", @Empty = false, @Image = "\"Integer\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |  +- BreakStatement[@Label = null]
@@ -78,19 +78,19 @@
          +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$S", @CanonicalName = "ExhaustiveSwitch.S", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "S", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{sealed, abstract, static}", @ExplicitModifiers = "{sealed}"]
          |  +- PermitsList[@Empty = false, @Size = 3]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "A"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "B"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "C"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$A", @CanonicalName = "ExhaustiveSwitch.A", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "A", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{static, final}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$B", @CanonicalName = "ExhaustiveSwitch.B", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "B", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{static, final}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$C", @CanonicalName = "ExhaustiveSwitch.C", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "C", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{}"]
@@ -100,7 +100,7 @@
          |  |     +- PrimitiveType[@Kind = PrimitiveTypeKind.INT]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testSealedExhaustive", @Name = "testSealedExhaustive", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
@@ -108,7 +108,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ReturnStatement[]
@@ -118,21 +118,21 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "1", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 1.0, @ValueAsFloat = 1.0, @ValueAsInt = 1, @ValueAsLong = 1]
          |           +- SwitchArrowBranch[@Default = false]
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "B"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "b", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
          |           +- SwitchArrowBranch[@Default = false]
          |              +- SwitchLabel[@Default = false]
          |              |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |              |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "C"]
          |              |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |              +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "3", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 3.0, @ValueAsFloat = 3.0, @ValueAsInt = 3, @ValueAsLong = 3]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "switchStatementExhaustive", @Name = "switchStatementExhaustive", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -141,7 +141,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -150,13 +150,13 @@
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
          |     |  |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- ExpressionStatement[]
          |     |  |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A", @Empty = false, @Image = "\"A\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  |  +- BreakStatement[@Label = null]
@@ -164,13 +164,13 @@
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "C"]
          |     |  |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- ExpressionStatement[]
          |     |  |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "C", @Empty = false, @Image = "\"C\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  |  +- BreakStatement[@Label = null]
@@ -180,7 +180,7 @@
          |     |     |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |     |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case, should be B", @Empty = false, @Image = "\"default case, should be B\"", @Length = 25, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |     +- BreakStatement[@Label = null]
@@ -190,26 +190,26 @@
          |  +- TypeParameters[@Empty = false, @Size = 1]
          |  |  +- TypeParameter[@Image = "T", @Name = "T", @TypeBound = false]
          |  +- PermitsList[@Empty = false, @Size = 2]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "E"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "F"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "E"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "F"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$E", @CanonicalName = "ExhaustiveSwitch.E", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "E", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{static, final}"]
          |  +- TypeParameters[@Empty = false, @Size = 1]
          |  |  +- TypeParameter[@Image = "X", @Name = "X", @TypeBound = false]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  |     +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$F", @CanonicalName = "ExhaustiveSwitch.F", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "F", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{static, final}"]
          |  +- TypeParameters[@Empty = false, @Size = 1]
          |  |  +- TypeParameter[@Image = "Y", @Name = "Y", @TypeBound = false]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  |     +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Y"]
+         |  |        +- ClassType[@FullyQualified = false, @SimpleName = "Y"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testGenericSealedExhaustive", @Name = "testGenericSealedExhaustive", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
@@ -217,9 +217,9 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ReturnStatement[]
@@ -229,9 +229,9 @@
          |              +- SwitchLabel[@Default = false]
          |              |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |              |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "F"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "F"]
          |              |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |              |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |              |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |              |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "bi", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |              +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -241,7 +241,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -250,7 +250,7 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- MethodCall[@CompileTimeConstant = false, @Image = "coverage", @MethodName = "coverage", @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- ArgumentList[@Empty = false, @Size = 1]
@@ -259,7 +259,7 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- MethodCall[@CompileTimeConstant = false, @Image = "coverage", @MethodName = "coverage", @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- ArgumentList[@Empty = false, @Size = 1]
@@ -268,12 +268,12 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- MethodCall[@CompileTimeConstant = false, @Image = "coverage", @MethodName = "coverage", @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- ArgumentList[@Empty = false, @Size = 1]
                |              +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |                 +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+               |                 +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                |                 +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "coverageStatement", @MethodName = "coverageStatement", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -287,79 +287,79 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "coverageStatement", @MethodName = "coverageStatement", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+               |           +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                |           +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A:", @Empty = false, @Image = "\"A:\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "testSealedExhaustive", @MethodName = "testSealedExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |                    +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |                    +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "B:", @Empty = false, @Image = "\"B:\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "testSealedExhaustive", @MethodName = "testSealedExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+               |                    +- ClassType[@FullyQualified = false, @SimpleName = "B"]
                |                    +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "C:", @Empty = false, @Image = "\"C:\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "testSealedExhaustive", @MethodName = "testSealedExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+               |                    +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                |                    +- ArgumentList[@Empty = false, @Size = 1]
                |                       +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "1", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 1.0, @ValueAsFloat = 1.0, @ValueAsInt = 1, @ValueAsLong = 1]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "switchStatementExhaustive", @MethodName = "switchStatementExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |           +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |           +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "switchStatementExhaustive", @MethodName = "switchStatementExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+               |           +- ClassType[@FullyQualified = false, @SimpleName = "B"]
                |           +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "switchStatementExhaustive", @MethodName = "switchStatementExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+               |           +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                |           +- ArgumentList[@Empty = false, @Size = 1]
                |              +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
                +- ExpressionStatement[]
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                            +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "F:", @Empty = false, @Image = "\"F:\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                            +- MethodCall[@CompileTimeConstant = false, @Image = "testGenericSealedExhaustive", @MethodName = "testGenericSealedExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                               +- ArgumentList[@Empty = false, @Size = 1]
                                  +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-                                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "F"]
+                                    +- ClassType[@FullyQualified = false, @SimpleName = "F"]
                                     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+                                    |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
                                     +- ArgumentList[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/GuardedAndParenthesizedPatterns.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/GuardedAndParenthesizedPatterns.txt
index 8da100b729..d2eb9c6cc7 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/GuardedAndParenthesizedPatterns.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/GuardedAndParenthesizedPatterns.txt
@@ -8,7 +8,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -17,7 +17,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -28,26 +28,26 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "single char string", @Empty = false, @Image = "\"single char string\"", @Length = 18, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "string", @Empty = false, @Image = "\"string\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -58,14 +58,14 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "integer 1", @Empty = false, @Image = "\"integer 1\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 1, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Long"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Long"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "l", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -76,19 +76,19 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "long 1 with parens", @Empty = false, @Image = "\"long 1 with parens\"", @Length = 18, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 3, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Double"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Double"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "double with parens", @Empty = false, @Image = "\"double with parens\"", @Length = 18, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -96,7 +96,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testIdentifierWhen", @Name = "testIdentifierWhen", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -105,14 +105,14 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "when", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ExpressionStatement[]
          |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |           +- ArgumentList[@Empty = false, @Size = 1]
          |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "when", @Name = "when", @ParenthesisDepth = 0, @Parenthesized = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testIdentifierWhen", @Name = "testIdentifierWhen", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -130,7 +130,7 @@
          |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |           +- ArgumentList[@Empty = false, @Size = 1]
          |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "when", @Name = "when", @ParenthesisDepth = 0, @Parenthesized = false]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "GuardedAndParenthesizedPatterns$when", @CanonicalName = "GuardedAndParenthesizedPatterns.when", @EffectiveVisibility = Visibility.V_PRIVATE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "when", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PRIVATE]
@@ -142,7 +142,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -151,7 +151,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 1, @Parenthesized = true]
@@ -162,26 +162,26 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "single char string", @Empty = false, @Image = "\"single char string\"", @Length = 18, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "string", @Empty = false, @Image = "\"string\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 1, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -192,14 +192,14 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "integer 1", @Empty = false, @Image = "\"integer 1\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 2, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Long"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Long"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "l", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 2, @Parenthesized = true]
@@ -210,19 +210,19 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "long 1 with parens", @Empty = false, @Image = "\"long 1 with parens\"", @Length = 18, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 3, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Double"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Double"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "double with parens", @Empty = false, @Image = "\"double with parens\"", @Length = 18, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
@@ -231,7 +231,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null!", @Empty = false, @Image = "\"null!\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -239,7 +239,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "instanceOfPattern", @Name = "instanceOfPattern", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -248,7 +248,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 3, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -258,7 +258,7 @@
          |     |  |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -270,7 +270,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A string containing at least two characters", @Empty = false, @Image = "\"A string containing at least two characters\"", @Length = 43, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- IfStatement[@Else = false]
@@ -284,7 +284,7 @@
          |     |  |     |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |     |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |     |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -296,7 +296,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A string containing at least three characters", @Empty = false, @Image = "\"A string containing at least three characters\"", @Length = 45, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- IfStatement[@Else = false]
@@ -306,7 +306,7 @@
          |        |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 1, @Parenthesized = true]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -318,7 +318,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A string containing at least four characters", @Empty = false, @Image = "\"A string containing at least four characters\"", @Length = 44, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testScopeOfPatternVariableDeclarations", @Name = "testScopeOfPatternVariableDeclarations", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -327,7 +327,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = true]
@@ -337,7 +337,7 @@
          |        |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -349,7 +349,7 @@
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
@@ -357,7 +357,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Not a string", @Empty = false, @Image = "\"Not a string\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -367,7 +367,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -401,7 +401,7 @@
                |  +- CatchClause[]
                |     +- CatchParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Multicatch = false, @Name = "e", @Visibility = Visibility.V_PACKAGE]
                |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NullPointerException"]
+               |     |  +- ClassType[@FullyQualified = false, @SimpleName = "NullPointerException"]
                |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = true, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "e", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
                |     +- Block[@Empty = false, @Size = 1, @containsComment = false]
                |        +- ExpressionStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/PatternsInSwitchLabels.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/PatternsInSwitchLabels.txt
index 938425e62b..a801d84fce 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/PatternsInSwitchLabels.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/PatternsInSwitchLabels.txt
@@ -9,20 +9,20 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 3, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "o"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "123L", @IntLiteral = false, @Integral = true, @LongLiteral = true, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 123.0, @ValueAsFloat = 123.0, @ValueAsInt = 123, @ValueAsLong = 123]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "formatted"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "formatted", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- SwitchExpression[@CompileTimeConstant = false, @DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -31,11 +31,11 @@
                |        |  +- SwitchLabel[@Default = false]
                |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+               |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
                |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |     +- ArgumentList[@Empty = false, @Size = 2]
                |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "int %d", @Empty = false, @Image = "\"int %d\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |        |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -43,11 +43,11 @@
                |        |  +- SwitchLabel[@Default = false]
                |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Long"]
+               |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Long"]
                |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "l", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |     +- ArgumentList[@Empty = false, @Size = 2]
                |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "long %d", @Empty = false, @Image = "\"long %d\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |        |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "l", @Name = "l", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -55,11 +55,11 @@
                |        |  +- SwitchLabel[@Default = false]
                |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Double"]
+               |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Double"]
                |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |     +- ArgumentList[@Empty = false, @Size = 2]
                |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "double %f", @Empty = false, @Image = "\"double %f\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |        |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "d", @Name = "d", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -67,11 +67,11 @@
                |        |  +- SwitchLabel[@Default = false]
                |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |     +- ArgumentList[@Empty = false, @Size = 2]
                |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String %s", @Empty = false, @Image = "\"String %s\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |        |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -84,6 +84,6 @@
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "formatted", @Name = "formatted", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatterns.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatterns.txt
index f5008407aa..ae9ecee4ce 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatterns.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatterns.txt
@@ -31,11 +31,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatterns$Rectangle", @CanonicalName = "RecordPatterns.Rectangle", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Rectangle", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -43,11 +43,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "upperLeft", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lowerRight", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "printSum1", @Name = "printSum1", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -56,7 +56,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -65,7 +65,7 @@
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 3, @containsComment = false]
          |           +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -88,7 +88,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x", @Name = "x", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -99,7 +99,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -107,7 +107,7 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "o", @Name = "o", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -122,7 +122,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x", @Name = "x", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -133,7 +133,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -141,22 +141,22 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |           |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "ul", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lr", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- MethodCall[@CompileTimeConstant = false, @Image = "c", @MethodName = "c", @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- AmbiguousName[@CompileTimeConstant = false, @Image = "ul", @Name = "ul", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -167,7 +167,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -175,34 +175,34 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |           |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |           |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |        |           |        +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |        |           |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lr", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "c", @Name = "c", @ParenthesisDepth = 0, @Parenthesized = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 6, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "createRectangle", @Name = "createRectangle", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  +- FormalParameters[@Empty = false, @Size = 6]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -214,7 +214,7 @@
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "y1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "c1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -226,31 +226,31 @@
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "y2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "c2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "r"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |     |        +- ArgumentList[@Empty = false, @Size = 2]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |     |           |  +- ArgumentList[@Empty = false, @Size = 2]
          |     |           |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |     |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |     |           |     |  +- ArgumentList[@Empty = false, @Size = 2]
          |     |           |     |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x1", @Name = "x1", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |     |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "y1", @Name = "y1", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "c1", @Name = "c1", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |     |              +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |     |              +- ArgumentList[@Empty = false, @Size = 2]
          |     |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |                 |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |     |                 |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |     |                 |  +- ArgumentList[@Empty = false, @Size = 2]
          |     |                 |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x2", @Name = "x2", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "y2", @Name = "y2", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -263,7 +263,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -271,36 +271,36 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |           |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |           |     |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |           |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |           |     |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |           |     |        +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |           |     |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "y", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |           |        +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |           |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lr", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Upper-left corner: ", @Empty = false, @Image = "\"Upper-left corner: \"", @Length = 19, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -310,11 +310,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "y", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "nestedPatternsCanFailToMatch", @Name = "nestedPatternsCanFailToMatch", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -324,11 +324,11 @@
          |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "p"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |        +- ArgumentList[@Empty = false, @Size = 2]
          |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
          |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
@@ -337,22 +337,22 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "p", @Name = "p", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |           |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |  +- ExpressionStatement[]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -364,7 +364,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Not a pair of strings", @Empty = false, @Image = "\"Not a pair of strings\"", @Length = 21, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatterns$Box", @CanonicalName = "RecordPatterns.Box", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Box", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -374,7 +374,7 @@
          |  +- RecordComponentList[@Empty = false, @Size = 1, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "test1a", @Name = "test1a", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -383,9 +383,9 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -393,20 +393,20 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |        |        +- PatternList[@Empty = false, @Size = 1]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -417,9 +417,9 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -427,20 +427,20 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |        +- PatternList[@Empty = false, @Size = 1]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -451,9 +451,9 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -461,18 +461,18 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        +- PatternList[@Empty = false, @Size = 1]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -483,11 +483,11 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -495,25 +495,25 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |        |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |        +- PatternList[@Empty = false, @Size = 1]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |              +- PatternList[@Empty = false, @Size = 1]
          |        |                 +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |                    +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |                    +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |                    +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -524,11 +524,11 @@
             +- FormalParameters[@Empty = false, @Size = 1]
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
             |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+            |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
             |     |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 1, @containsComment = false]
                +- IfStatement[@Else = false]
@@ -536,21 +536,21 @@
                   |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- RecordPattern[@ParenthesisDepth = 0]
-                  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+                  |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
                   |        +- PatternList[@Empty = false, @Size = 1]
                   |           +- RecordPattern[@ParenthesisDepth = 0]
-                  |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+                  |              +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
                   |              +- PatternList[@Empty = false, @Size = 1]
                   |                 +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |                    +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+                  |                    +- ClassType[@FullyQualified = false, @SimpleName = "var"]
                   |                    +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   +- Block[@Empty = false, @Size = 1, @containsComment = false]
                      +- ExpressionStatement[]
                         +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                            +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                            |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                            +- ArgumentList[@Empty = false, @Size = 1]
                               +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                                  +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatternsExhaustiveSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatternsExhaustiveSwitch.txt
index db0ea9f29c..74e48e65c2 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatternsExhaustiveSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatternsExhaustiveSwitch.txt
@@ -8,23 +8,23 @@
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$B", @CanonicalName = "RecordPatternsExhaustiveSwitch.B", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "B", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |  +- ExtendsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "A"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$I", @CanonicalName = "RecordPatternsExhaustiveSwitch.I", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "I", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{sealed, abstract, static}", @ExplicitModifiers = "{sealed}"]
          |  +- PermitsList[@Empty = false, @Size = 2]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "C"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "D"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$C", @CanonicalName = "RecordPatternsExhaustiveSwitch.C", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "C", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$D", @CanonicalName = "RecordPatternsExhaustiveSwitch.D", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "D", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$Pair", @CanonicalName = "RecordPatternsExhaustiveSwitch.Pair", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Pair", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{}"]
@@ -33,11 +33,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "y", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "test", @Name = "test", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -47,17 +47,17 @@
             +- Block[@Empty = false, @Size = 5, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "p1"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |  |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "p2"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -66,64 +66,64 @@
                |  +- SwitchArrowBranch[@Default = false]
                |  |  +- SwitchLabel[@Default = false]
                |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-               |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  |  |     +- PatternList[@Empty = false, @Size = 2]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+               |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "B"]
                |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "b", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |  |     +- ArgumentList[@Empty = false, @Size = 1]
                |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |  +- SwitchArrowBranch[@Default = false]
                |  |  +- SwitchLabel[@Default = false]
                |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-               |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  |  |     +- PatternList[@Empty = false, @Size = 2]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+               |  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "B"]
                |  |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "b", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |  |     +- ArgumentList[@Empty = false, @Size = 1]
                |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |  +- SwitchArrowBranch[@Default = false]
                |     +- SwitchLabel[@Default = false]
                |     |  +- RecordPattern[@ParenthesisDepth = 0]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |     |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |     |     +- PatternList[@Empty = false, @Size = 2]
                |     |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |     |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |     |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a1", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |     |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |     |           +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a2", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |        +- ArgumentList[@Empty = false, @Size = 1]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "exhaustive now", @Empty = false, @Image = "\"exhaustive now\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -131,43 +131,43 @@
                |  +- SwitchArrowBranch[@Default = false]
                |  |  +- SwitchLabel[@Default = false]
                |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-               |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |  |  |     +- PatternList[@Empty = false, @Size = 2]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |  |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+               |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |  |     +- ArgumentList[@Empty = false, @Size = 1]
                |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |  +- SwitchArrowBranch[@Default = false]
                |     +- SwitchLabel[@Default = false]
                |     |  +- RecordPattern[@ParenthesisDepth = 0]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |     |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |     |     +- PatternList[@Empty = false, @Size = 2]
                |     |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |     |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |     |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |     |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+               |     |           +- ClassType[@FullyQualified = false, @SimpleName = "D"]
                |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |        +- ArgumentList[@Empty = false, @Size = 1]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -175,63 +175,63 @@
                   +- SwitchArrowBranch[@Default = false]
                   |  +- SwitchLabel[@Default = false]
                   |  |  +- RecordPattern[@ParenthesisDepth = 0]
-                  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+                  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                   |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+                  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                   |  |     +- PatternList[@Empty = false, @Size = 2]
                   |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+                  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                   |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+                  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                   |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |     +- ArgumentList[@Empty = false, @Size = 1]
                   |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   +- SwitchArrowBranch[@Default = false]
                   |  +- SwitchLabel[@Default = false]
                   |  |  +- RecordPattern[@ParenthesisDepth = 0]
-                  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+                  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                   |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+                  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                   |  |     +- PatternList[@Empty = false, @Size = 2]
                   |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+                  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "D"]
                   |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+                  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                   |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |     +- ArgumentList[@Empty = false, @Size = 1]
                   |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   +- SwitchArrowBranch[@Default = false]
                      +- SwitchLabel[@Default = false]
                      |  +- RecordPattern[@ParenthesisDepth = 0]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                      |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+                     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                      |     +- PatternList[@Empty = false, @Size = 2]
                      |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                      |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+                     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "D"]
                      |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d1", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                      |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                      |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+                     |           +- ClassType[@FullyQualified = false, @SimpleName = "D"]
                      |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d2", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                      +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                         +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                         |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                         +- ArgumentList[@Empty = false, @Size = 1]
                            +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatternsInEnhancedFor.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatternsInEnhancedFor.txt
index 7873bab2c5..52185fff22 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatternsInEnhancedFor.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RecordPatternsInEnhancedFor.txt
@@ -31,11 +31,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsInEnhancedFor$Rectangle", @CanonicalName = "RecordPatternsInEnhancedFor.Rectangle", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Rectangle", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -43,11 +43,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "upperLeft", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lowerRight", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "dump", @Name = "dump", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -57,22 +57,22 @@
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |  |     +- ArrayType[@ArrayDepth = 1]
-         |  |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |  |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |  |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |  |     |     +- ArrayTypeDim[@Varargs = false]
          |  |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "pointArray", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ForeachStatement[]
          |        +- RecordPattern[@ParenthesisDepth = 0]
-         |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |  +- PatternList[@Empty = false, @Size = 2]
          |        |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "y", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "pointArray", @Name = "pointArray", @ParenthesisDepth = 0, @Parenthesized = false]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
@@ -80,7 +80,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -98,29 +98,29 @@
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |  |     +- ArrayType[@ArrayDepth = 1]
-         |  |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |  |     |     +- ArrayTypeDim[@Varargs = false]
          |  |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ForeachStatement[]
          |        +- RecordPattern[@ParenthesisDepth = 0]
-         |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |        |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |        |  +- PatternList[@Empty = false, @Size = 2]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |     |  +- PatternList[@Empty = false, @Size = 2]
          |        |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |     |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |        |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |        |     |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lr", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
@@ -128,7 +128,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "c", @Name = "c", @ParenthesisDepth = 0, @Parenthesized = false]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsInEnhancedFor$Pair", @CanonicalName = "RecordPatternsInEnhancedFor.Pair", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Pair", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -136,11 +136,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "fst", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "snd", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "exceptionTest", @Name = "exceptionTest", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -151,39 +151,39 @@
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |     |  +- ArrayType[@ArrayDepth = 1]
-         |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |  |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |     |  |     +- ArrayTypeDim[@Varargs = false]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "ps"]
          |     |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "ps", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ArrayAllocation[@ArrayDepth = 1, @CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- ArrayType[@ArrayDepth = 1]
-         |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |        |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |     |        |     +- ArrayTypeDim[@Varargs = false]
          |     |        +- ArrayInitializer[@CompileTimeConstant = false, @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |           |  +- ArgumentList[@Empty = false, @Size = 2]
          |     |           |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "1", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 1.0, @ValueAsFloat = 1.0, @ValueAsInt = 1, @ValueAsLong = 1]
          |     |           |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
          |     |           +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |              +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |              +- ArgumentList[@Empty = false, @Size = 2]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "hello", @Empty = false, @Image = "\"hello\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "world", @Empty = false, @Image = "\"world\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- ForeachStatement[]
          |        +- RecordPattern[@ParenthesisDepth = 0]
-         |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |        |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |        |  +- PatternList[@Empty = false, @Size = 2]
          |        |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "f", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "ps", @Name = "ps", @ParenthesisDepth = 0, @Parenthesized = false]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
@@ -191,7 +191,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -205,7 +205,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RefiningPatternsInSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RefiningPatternsInSwitch.txt
index 7fcb726cda..7eddedd5d9 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RefiningPatternsInSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/RefiningPatternsInSwitch.txt
@@ -8,12 +8,12 @@
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RefiningPatternsInSwitch$Rectangle", @CanonicalName = "RefiningPatternsInSwitch.Rectangle", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Rectangle", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
          |  +- ExtendsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RefiningPatternsInSwitch$Triangle", @CanonicalName = "RefiningPatternsInSwitch.Triangle", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Triangle", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
          |  +- ExtendsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  +- ClassOrInterfaceBody[@Empty = false, @Size = 3]
          |     +- FieldDeclaration[@EffectiveVisibility = Visibility.V_PRIVATE, @Static = false, @Visibility = Visibility.V_PRIVATE]
          |     |  +- ModifierList[@EffectiveModifiers = "{private}", @ExplicitModifiers = "{private}"]
@@ -46,7 +46,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -59,7 +59,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- IfStatement[@Else = false]
          |        |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -72,7 +72,7 @@
          |        |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Large triangle", @Empty = false, @Image = "\"Large triangle\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |        +- BreakStatement[@Label = null]
@@ -82,7 +82,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A shape, possibly a small triangle", @Empty = false, @Image = "\"A shape, possibly a small triangle\"", @Length = 34, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testTriangleRefined", @Name = "testTriangleRefined", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -91,7 +91,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -105,7 +105,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -116,7 +116,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Large triangle", @Empty = false, @Image = "\"Large triangle\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -124,7 +124,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A shape, possibly a small triangle", @Empty = false, @Image = "\"A shape, possibly a small triangle\"", @Length = 34, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testTriangleRefined2", @Name = "testTriangleRefined2", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -133,7 +133,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -147,7 +147,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -158,19 +158,19 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Large triangle", @Empty = false, @Image = "\"Large triangle\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Small triangle", @Empty = false, @Image = "\"Small triangle\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -178,7 +178,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Non-triangle", @Empty = false, @Image = "\"Non-triangle\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -188,36 +188,36 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 12, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "large"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "large", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+               |        +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
                |        +- ArgumentList[@Empty = false, @Size = 1]
                |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "200", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 200.0, @ValueAsFloat = 200.0, @ValueAsInt = 200, @ValueAsLong = 200]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "small"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "small", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+               |        +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
                |        +- ArgumentList[@Empty = false, @Size = 1]
                |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "10", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 10.0, @ValueAsFloat = 10.0, @ValueAsInt = 10, @ValueAsLong = 10]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "rect"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "rect", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+               |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
                |        +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "testTriangle", @MethodName = "testTriangle", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/ScopeOfPatternVariableDeclarations.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/ScopeOfPatternVariableDeclarations.txt
index a5f3e02e67..12606cd085 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/ScopeOfPatternVariableDeclarations.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java20p/ScopeOfPatternVariableDeclarations.txt
@@ -8,7 +8,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -17,7 +17,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Character"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Character"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -29,7 +29,7 @@
          |        |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Ding!", @Empty = false, @Image = "\"Ding!\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |  +- BreakStatement[@Label = null]
@@ -42,7 +42,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -51,7 +51,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Character"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Character"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |        |     +- IfStatement[@Else = false]
@@ -65,25 +65,25 @@
          |        |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Ding!", @Empty = false, @Image = "\"Ding!\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Character", @Empty = false, @Image = "\"Character\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- ThrowStatement[]
          |        |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IllegalStateException"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "IllegalStateException"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Invalid Integer argument of value ", @Empty = false, @Image = "\"Invalid Integer argument of value \"", @Length = 34, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -100,7 +100,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -109,7 +109,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Character"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Character"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- IfStatement[@Else = false]
          |        |  |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -122,7 +122,7 @@
          |        |  |        +- MethodCall[@CompileTimeConstant = false, @Image = "print", @MethodName = "print", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Ding ", @Empty = false, @Image = "\"Ding \"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |  +- IfStatement[@Else = false]
@@ -136,14 +136,14 @@
          |        |  |        +- MethodCall[@CompileTimeConstant = false, @Image = "print", @MethodName = "print", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Tab ", @Empty = false, @Image = "\"Tab \"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |  +- ExpressionStatement[]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "character", @Empty = false, @Image = "\"character\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchFallthroughBranch[@Default = true]
@@ -152,7 +152,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "fall-through", @Empty = false, @Image = "\"fall-through\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -162,7 +162,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -184,14 +184,14 @@
                |  +- CatchClause[]
                |     +- CatchParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Multicatch = false, @Name = "e", @Visibility = Visibility.V_PACKAGE]
                |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IllegalStateException"]
+               |     |  +- ClassType[@FullyQualified = false, @SimpleName = "IllegalStateException"]
                |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = true, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "e", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
                |     +- Block[@Empty = false, @Size = 1, @containsComment = false]
                |        +- ExpressionStatement[]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "e", @Name = "e", @ParenthesisDepth = 0, @Parenthesized = false]
                +- ExpressionStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/AnnotationValueInitializers.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/AnnotationValueInitializers.txt
index 2d0d3072f2..e64fca3917 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/AnnotationValueInitializers.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/AnnotationValueInitializers.txt
@@ -2,7 +2,7 @@
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "AnnotationValueInitializers", @CanonicalName = "AnnotationValueInitializers", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "AnnotationValueInitializers", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PACKAGE]
    |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
    |  |  +- Annotation[@SimpleName = "MyAnnotation"]
-   |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
+   |  |     +- ClassType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
    |  |     +- AnnotationMemberList[@Empty = false, @Size = 2]
    |  |        +- MemberValuePair[@Image = "a", @Name = "a", @Shorthand = false]
    |  |        |  +- MemberValueArrayInitializer[]
@@ -13,7 +13,7 @@
    +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "AnnotationValueInitializers2", @CanonicalName = "AnnotationValueInitializers2", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = false, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "AnnotationValueInitializers2", @Static = false, @TopLevel = true, @Visibility = Visibility.V_PACKAGE]
       +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
       |  +- Annotation[@SimpleName = "MyAnnotation"]
-      |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
+      |     +- ClassType[@FullyQualified = false, @SimpleName = "MyAnnotation"]
       |     +- AnnotationMemberList[@Empty = false, @Size = 2]
       |        +- MemberValuePair[@Image = "a", @Name = "a", @Shorthand = false]
       |        |  +- MemberValueArrayInitializer[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/DealingWithNull.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/DealingWithNull.txt
index 9a07d342b0..e9e24cad1d 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/DealingWithNull.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/DealingWithNull.txt
@@ -8,7 +8,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -19,7 +19,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Oops", @Empty = false, @Image = "\"Oops\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
@@ -29,7 +29,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Great", @Empty = false, @Image = "\"Great\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -37,7 +37,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Ok", @Empty = false, @Image = "\"Ok\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testStringOrNull", @Name = "testStringOrNull", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -46,7 +46,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -55,12 +55,12 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String: ", @Empty = false, @Image = "\"String: \"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -71,7 +71,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null", @Empty = false, @Image = "\"null\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -79,7 +79,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testStringOrDefaultNull", @Name = "testStringOrDefaultNull", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -88,7 +88,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -97,12 +97,12 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String: ", @Empty = false, @Image = "\"String: \"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -113,7 +113,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null or default case", @Empty = false, @Image = "\"null or default case\"", @Length = 20, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "test2", @Name = "test2", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -122,7 +122,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -132,18 +132,18 @@
          |        |  |  +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- ThrowStatement[]
          |        |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NullPointerException"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "NullPointerException"]
          |        |        +- ArgumentList[@Empty = true, @Size = 0]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String: ", @Empty = false, @Image = "\"String: \"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -152,12 +152,12 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Integer", @Empty = false, @Image = "\"Integer\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -165,7 +165,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default", @Empty = false, @Image = "\"default\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "test3", @Name = "test3", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -174,7 +174,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 4, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -186,7 +186,7 @@
          |     |  |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null", @Empty = false, @Image = "\"null\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  |  +- BreakStatement[@Label = null]
@@ -194,13 +194,13 @@
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- ExpressionStatement[]
          |     |  |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String", @Empty = false, @Image = "\"String\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  |  +- BreakStatement[@Label = null]
@@ -210,7 +210,7 @@
          |     |     |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |     |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |     +- BreakStatement[@Label = null]
@@ -222,19 +222,19 @@
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null", @Empty = false, @Image = "\"null\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  +- SwitchArrowBranch[@Default = false]
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String", @Empty = false, @Image = "\"String\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  +- SwitchArrowBranch[@Default = true]
@@ -242,7 +242,7 @@
          |     |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -256,7 +256,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "The rest (including null)", @Empty = false, @Image = "\"The rest (including null)\"", @Length = 25, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -267,7 +267,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "The rest (including null)", @Empty = false, @Image = "\"The rest (including null)\"", @Length = 25, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -277,7 +277,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -299,14 +299,14 @@
                |  +- CatchClause[]
                |     +- CatchParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Multicatch = false, @Name = "e", @Visibility = Visibility.V_PACKAGE]
                |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NullPointerException"]
+               |     |  +- ClassType[@FullyQualified = false, @SimpleName = "NullPointerException"]
                |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = true, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "e", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
                |     +- Block[@Empty = false, @Size = 1, @containsComment = false]
                |        +- ExpressionStatement[]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "e", @Name = "e", @ParenthesisDepth = 0, @Parenthesized = false]
                +- ExpressionStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/EnhancedTypeCheckingSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/EnhancedTypeCheckingSwitch.txt
index 59c9ec3b2f..dab7a6e51b 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/EnhancedTypeCheckingSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/EnhancedTypeCheckingSwitch.txt
@@ -32,7 +32,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -43,31 +43,31 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null", @Empty = false, @Image = "\"null\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String", @Empty = false, @Image = "\"String\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Color: ", @Empty = false, @Image = "\"Color: \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -78,12 +78,12 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Record class: ", @Empty = false, @Image = "\"Record class: \"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -102,7 +102,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Array of ints of length", @Empty = false, @Image = "\"Array of ints of length\"", @Length = 23, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -113,7 +113,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Something else", @Empty = false, @Image = "\"Something else\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -123,14 +123,14 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 9, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "o"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "test", @Empty = false, @Image = "\"test\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -143,7 +143,7 @@
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "BLUE", @Name = "BLUE", @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+               |              +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
                +- ExpressionStatement[]
                |  +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- VariableAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "o", @Name = "o", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -165,7 +165,7 @@
                |  +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- VariableAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "o", @Name = "o", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+               |        +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
                |        +- ArgumentList[@Empty = false, @Size = 2]
                |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "7", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 7.0, @ValueAsFloat = 7.0, @ValueAsInt = 7, @ValueAsLong = 7]
                |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "8", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 8.0, @ValueAsFloat = 8.0, @ValueAsInt = 8, @ValueAsLong = 8]
@@ -177,7 +177,7 @@
                |  +- AssignmentExpression[@CompileTimeConstant = false, @Compound = false, @Operator = AssignmentOp.ASSIGN, @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- VariableAccess[@AccessType = AccessType.WRITE, @CompileTimeConstant = false, @Image = "o", @Name = "o", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+               |        +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                |        +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                   +- MethodCall[@CompileTimeConstant = false, @Image = "typeTester", @MethodName = "typeTester", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/ExhaustiveSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/ExhaustiveSwitch.txt
index afd5598c3f..c84ba2fd0f 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/ExhaustiveSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/ExhaustiveSwitch.txt
@@ -8,7 +8,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ReturnStatement[]
@@ -18,7 +18,7 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |     +- AmbiguousName[@CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -27,7 +27,7 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- SwitchArrowBranch[@Default = true]
@@ -39,7 +39,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -48,13 +48,13 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- ExpressionStatement[]
          |        |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- BreakStatement[@Label = null]
@@ -62,13 +62,13 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- ExpressionStatement[]
          |        |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Integer", @Empty = false, @Image = "\"Integer\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |  +- BreakStatement[@Label = null]
@@ -78,19 +78,19 @@
          +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$S", @CanonicalName = "ExhaustiveSwitch.S", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "S", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{sealed, abstract, static}", @ExplicitModifiers = "{sealed}"]
          |  +- PermitsList[@Empty = false, @Size = 3]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "A"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "B"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "C"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$A", @CanonicalName = "ExhaustiveSwitch.A", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "A", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{static, final}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$B", @CanonicalName = "ExhaustiveSwitch.B", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "B", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{static, final}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$C", @CanonicalName = "ExhaustiveSwitch.C", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "C", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{}"]
@@ -100,7 +100,7 @@
          |  |     +- PrimitiveType[@Kind = PrimitiveTypeKind.INT]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testSealedExhaustive", @Name = "testSealedExhaustive", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
@@ -108,7 +108,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ReturnStatement[]
@@ -118,21 +118,21 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "1", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 1.0, @ValueAsFloat = 1.0, @ValueAsInt = 1, @ValueAsLong = 1]
          |           +- SwitchArrowBranch[@Default = false]
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "B"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "b", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
          |           +- SwitchArrowBranch[@Default = false]
          |              +- SwitchLabel[@Default = false]
          |              |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |              |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "C"]
          |              |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |              +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "3", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 3.0, @ValueAsFloat = 3.0, @ValueAsInt = 3, @ValueAsLong = 3]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "switchStatementExhaustive", @Name = "switchStatementExhaustive", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -141,7 +141,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -150,13 +150,13 @@
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
          |     |  |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- ExpressionStatement[]
          |     |  |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A", @Empty = false, @Image = "\"A\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  |  +- BreakStatement[@Label = null]
@@ -164,13 +164,13 @@
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "C"]
          |     |  |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- ExpressionStatement[]
          |     |  |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |  |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |  |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "C", @Empty = false, @Image = "\"C\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |  |  +- BreakStatement[@Label = null]
@@ -180,7 +180,7 @@
          |     |     |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |     |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case, should be B", @Empty = false, @Image = "\"default case, should be B\"", @Length = 25, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |     +- BreakStatement[@Label = null]
@@ -190,26 +190,26 @@
          |  +- TypeParameters[@Empty = false, @Size = 1]
          |  |  +- TypeParameter[@Image = "T", @Name = "T", @TypeBound = false]
          |  +- PermitsList[@Empty = false, @Size = 2]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "E"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "F"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "E"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "F"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$E", @CanonicalName = "ExhaustiveSwitch.E", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "E", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{static, final}"]
          |  +- TypeParameters[@Empty = false, @Size = 1]
          |  |  +- TypeParameter[@Image = "X", @Name = "X", @TypeBound = false]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  |     +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "ExhaustiveSwitch$F", @CanonicalName = "ExhaustiveSwitch.F", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "F", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{static, final}"]
          |  +- TypeParameters[@Empty = false, @Size = 1]
          |  |  +- TypeParameter[@Image = "Y", @Name = "Y", @TypeBound = false]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  |     +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Y"]
+         |  |        +- ClassType[@FullyQualified = false, @SimpleName = "Y"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testGenericSealedExhaustive", @Name = "testGenericSealedExhaustive", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
@@ -217,9 +217,9 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ReturnStatement[]
@@ -229,9 +229,9 @@
          |              +- SwitchLabel[@Default = false]
          |              |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |              |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "F"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "F"]
          |              |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |              |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |              |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |              |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "bi", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |              +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -241,7 +241,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -250,7 +250,7 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- MethodCall[@CompileTimeConstant = false, @Image = "coverage", @MethodName = "coverage", @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- ArgumentList[@Empty = false, @Size = 1]
@@ -259,7 +259,7 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- MethodCall[@CompileTimeConstant = false, @Image = "coverage", @MethodName = "coverage", @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- ArgumentList[@Empty = false, @Size = 1]
@@ -268,12 +268,12 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- MethodCall[@CompileTimeConstant = false, @Image = "coverage", @MethodName = "coverage", @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- ArgumentList[@Empty = false, @Size = 1]
                |              +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |                 +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+               |                 +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                |                 +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "coverageStatement", @MethodName = "coverageStatement", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -287,79 +287,79 @@
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "coverageStatement", @MethodName = "coverageStatement", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+               |           +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                |           +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A:", @Empty = false, @Image = "\"A:\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "testSealedExhaustive", @MethodName = "testSealedExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |                    +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |                    +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "B:", @Empty = false, @Image = "\"B:\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "testSealedExhaustive", @MethodName = "testSealedExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+               |                    +- ClassType[@FullyQualified = false, @SimpleName = "B"]
                |                    +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "C:", @Empty = false, @Image = "\"C:\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "testSealedExhaustive", @MethodName = "testSealedExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+               |                    +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                |                    +- ArgumentList[@Empty = false, @Size = 1]
                |                       +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "1", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 1.0, @ValueAsFloat = 1.0, @ValueAsInt = 1, @ValueAsLong = 1]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "switchStatementExhaustive", @MethodName = "switchStatementExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |           +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |           +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "switchStatementExhaustive", @MethodName = "switchStatementExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+               |           +- ClassType[@FullyQualified = false, @SimpleName = "B"]
                |           +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "switchStatementExhaustive", @MethodName = "switchStatementExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                |     +- ArgumentList[@Empty = false, @Size = 1]
                |        +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+               |           +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                |           +- ArgumentList[@Empty = false, @Size = 1]
                |              +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "2", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 2.0, @ValueAsFloat = 2.0, @ValueAsInt = 2, @ValueAsLong = 2]
                +- ExpressionStatement[]
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                            +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "F:", @Empty = false, @Image = "\"F:\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                            +- MethodCall[@CompileTimeConstant = false, @Image = "testGenericSealedExhaustive", @MethodName = "testGenericSealedExhaustive", @ParenthesisDepth = 0, @Parenthesized = false]
                               +- ArgumentList[@Empty = false, @Size = 1]
                                  +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-                                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "F"]
+                                    +- ClassType[@FullyQualified = false, @SimpleName = "F"]
                                     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+                                    |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
                                     +- ArgumentList[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/GuardedPatterns.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/GuardedPatterns.txt
index 1d7ba1303c..2102bab183 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/GuardedPatterns.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/GuardedPatterns.txt
@@ -8,7 +8,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -17,7 +17,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -28,26 +28,26 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "single char string", @Empty = false, @Image = "\"single char string\"", @Length = 18, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "string", @Empty = false, @Image = "\"string\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -58,7 +58,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "integer 1", @Empty = false, @Image = "\"integer 1\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -66,7 +66,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testIdentifierWhen", @Name = "testIdentifierWhen", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -75,14 +75,14 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "when", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ExpressionStatement[]
          |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |           +- ArgumentList[@Empty = false, @Size = 1]
          |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "when", @Name = "when", @ParenthesisDepth = 0, @Parenthesized = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testIdentifierWhen", @Name = "testIdentifierWhen", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -100,7 +100,7 @@
          |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |           +- ArgumentList[@Empty = false, @Size = 1]
          |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "when", @Name = "when", @ParenthesisDepth = 0, @Parenthesized = false]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "GuardedPatterns$when", @CanonicalName = "GuardedPatterns.when", @EffectiveVisibility = Visibility.V_PRIVATE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "when", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PRIVATE]
@@ -112,7 +112,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -121,7 +121,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 1, @Parenthesized = true]
@@ -132,26 +132,26 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "single char string", @Empty = false, @Image = "\"single char string\"", @Length = 18, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "string", @Empty = false, @Image = "\"string\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -162,7 +162,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "integer 1", @Empty = false, @Image = "\"integer 1\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
@@ -171,7 +171,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "null!", @Empty = false, @Image = "\"null!\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -179,7 +179,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "default case", @Empty = false, @Image = "\"default case\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "instanceOfPattern", @Name = "instanceOfPattern", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -188,7 +188,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 3, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -198,7 +198,7 @@
          |     |  |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -210,7 +210,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A string containing at least two characters", @Empty = false, @Image = "\"A string containing at least two characters\"", @Length = 43, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- IfStatement[@Else = false]
@@ -224,7 +224,7 @@
          |     |  |     |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |     |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |     |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |        +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -236,7 +236,7 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A string containing at least three characters", @Empty = false, @Image = "\"A string containing at least three characters\"", @Length = 45, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- IfStatement[@Else = false]
@@ -246,7 +246,7 @@
          |        |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 1, @Parenthesized = true]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -258,7 +258,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A string containing at least four characters", @Empty = false, @Image = "\"A string containing at least four characters\"", @Length = 44, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testScopeOfPatternVariableDeclarations", @Name = "testScopeOfPatternVariableDeclarations", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -267,7 +267,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = true]
@@ -277,7 +277,7 @@
          |        |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "length", @MethodName = "length", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -289,7 +289,7 @@
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
@@ -297,7 +297,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Not a string", @Empty = false, @Image = "\"Not a string\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -307,7 +307,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -341,7 +341,7 @@
                |  +- CatchClause[]
                |     +- CatchParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Multicatch = false, @Name = "e", @Visibility = Visibility.V_PACKAGE]
                |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NullPointerException"]
+               |     |  +- ClassType[@FullyQualified = false, @SimpleName = "NullPointerException"]
                |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = true, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "e", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
                |     +- Block[@Empty = false, @Size = 1, @containsComment = false]
                |        +- ExpressionStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/Jep440_RecordPatterns.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/Jep440_RecordPatterns.txt
index b75b16c793..f5bb6d1ba3 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/Jep440_RecordPatterns.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/Jep440_RecordPatterns.txt
@@ -20,7 +20,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -28,7 +28,7 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "obj", @Name = "obj", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -43,7 +43,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x", @Name = "x", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -65,11 +65,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep440_RecordPatterns$Rectangle", @CanonicalName = "Jep440_RecordPatterns.Rectangle", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Rectangle", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -77,11 +77,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "upperLeft", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lowerRight", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "printColorOfUpperLeftPoint", @Name = "printColorOfUpperLeftPoint", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -90,7 +90,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -98,29 +98,29 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |           |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |           |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |        |           |        +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |        |           |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lr", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "c", @Name = "c", @ParenthesisDepth = 0, @Parenthesized = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "printXCoordOfUpperLeftPointWithPatterns", @Name = "printXCoordOfUpperLeftPointWithPatterns", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -129,7 +129,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -137,36 +137,36 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |           |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |           |     |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |           |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |           |     |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |           |     |        +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |           |     |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "y", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |           |        +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |           |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lr", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Upper-left corner: ", @Empty = false, @Image = "\"Upper-left corner: \"", @Length = 19, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -176,11 +176,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "y", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "patternsCanFailToMatch", @Name = "patternsCanFailToMatch", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -190,11 +190,11 @@
          |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "p"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |        +- ArgumentList[@Empty = false, @Size = 2]
          |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
          |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
@@ -203,22 +203,22 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "p", @Name = "p", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |           |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |  +- ExpressionStatement[]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -230,7 +230,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Not a pair of strings", @Empty = false, @Image = "\"Not a pair of strings\"", @Length = 21, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep440_RecordPatterns$MyPair", @CanonicalName = "Jep440_RecordPatterns.MyPair", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "MyPair", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -241,11 +241,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "S"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "S"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "fst", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "snd", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- EmptyDeclaration[]
@@ -255,10 +255,10 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyPair"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "MyPair"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 2]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "pair", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -266,20 +266,20 @@
          |        +- SwitchArrowBranch[@Default = false]
          |           +- SwitchLabel[@Default = false]
          |           |  +- RecordPattern[@ParenthesisDepth = 0]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "MyPair"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "MyPair"]
          |           |     +- PatternList[@Empty = false, @Size = 2]
          |           |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |           |        |  +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |           |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "f", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |           |           +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |           |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "matched", @Empty = false, @Image = "\"matched\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep440_RecordPatterns$Box", @CanonicalName = "Jep440_RecordPatterns.Box", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Box", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -289,7 +289,7 @@
          |  +- RecordComponentList[@Empty = false, @Size = 1, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "test1", @Name = "test1", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -298,11 +298,11 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bbs", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -310,25 +310,25 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bbs", @Name = "bbs", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |        |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |        +- PatternList[@Empty = false, @Size = 1]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |              +- PatternList[@Empty = false, @Size = 1]
          |        |                 +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |                    +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |                    +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |                    +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -339,11 +339,11 @@
             +- FormalParameters[@Empty = false, @Size = 1]
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
             |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+            |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
             |     |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bbs", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 1, @containsComment = false]
                +- IfStatement[@Else = false]
@@ -351,21 +351,21 @@
                   |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bbs", @Name = "bbs", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- RecordPattern[@ParenthesisDepth = 0]
-                  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+                  |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
                   |        +- PatternList[@Empty = false, @Size = 1]
                   |           +- RecordPattern[@ParenthesisDepth = 0]
-                  |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+                  |              +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
                   |              +- PatternList[@Empty = false, @Size = 1]
                   |                 +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |                    +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+                  |                    +- ClassType[@FullyQualified = false, @SimpleName = "var"]
                   |                    +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   +- Block[@Empty = false, @Size = 1, @containsComment = false]
                      +- ExpressionStatement[]
                         +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                            +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                            |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                            +- ArgumentList[@Empty = false, @Size = 1]
                               +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                                  +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/Jep441_PatternMatchingForSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/Jep441_PatternMatchingForSwitch.txt
index 513c3b4317..46deb7e010 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/Jep441_PatternMatchingForSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/Jep441_PatternMatchingForSwitch.txt
@@ -4,11 +4,11 @@
       +- ClassOrInterfaceBody[@Empty = false, @Size = 13]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "formatterPatternSwitch", @Name = "formatterPatternSwitch", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ReturnStatement[]
@@ -18,11 +18,11 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |     +- ArgumentList[@Empty = false, @Size = 2]
          |           |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "int %d", @Empty = false, @Image = "\"int %d\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |           |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -30,11 +30,11 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Long"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Long"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "l", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |     +- ArgumentList[@Empty = false, @Size = 2]
          |           |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "long %d", @Empty = false, @Image = "\"long %d\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |           |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "l", @Name = "l", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -42,11 +42,11 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Double"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Double"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |     +- ArgumentList[@Empty = false, @Size = 2]
          |           |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "double %f", @Empty = false, @Image = "\"double %f\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |           |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "d", @Name = "d", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -54,11 +54,11 @@
          |           |  +- SwitchLabel[@Default = false]
          |           |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |     +- ArgumentList[@Empty = false, @Size = 2]
          |           |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String %s", @Empty = false, @Image = "\"String %s\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |           |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -73,7 +73,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -84,7 +84,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Oops", @Empty = false, @Image = "\"Oops\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
@@ -94,7 +94,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Great", @Empty = false, @Image = "\"Great\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -102,7 +102,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Ok", @Empty = false, @Image = "\"Ok\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testStringNew", @Name = "testStringNew", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -111,7 +111,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "response", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -124,7 +124,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "equalsIgnoreCase", @MethodName = "equalsIgnoreCase", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -136,14 +136,14 @@
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "You got it", @Empty = false, @Image = "\"You got it\"", @Length = 10, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "equalsIgnoreCase", @MethodName = "equalsIgnoreCase", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -155,21 +155,21 @@
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Shame", @Empty = false, @Image = "\"Shame\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |           +- SwitchLabel[@Default = false]
          |           |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |              +- ExpressionStatement[]
          |                 +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                    |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                    +- ArgumentList[@Empty = false, @Size = 1]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Sorry?", @Empty = false, @Image = "\"Sorry?\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testStringEnhanced", @Name = "testStringEnhanced", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -178,7 +178,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "response", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -196,7 +196,7 @@
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "You got it", @Empty = false, @Image = "\"You got it\"", @Length = 10, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
@@ -208,14 +208,14 @@
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Shame", @Empty = false, @Image = "\"Shame\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "equalsIgnoreCase", @MethodName = "equalsIgnoreCase", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -227,14 +227,14 @@
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "You got it", @Empty = false, @Image = "\"You got it\"", @Length = 10, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "equalsIgnoreCase", @MethodName = "equalsIgnoreCase", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -246,33 +246,33 @@
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Shame", @Empty = false, @Image = "\"Shame\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |           +- SwitchLabel[@Default = false]
          |           |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |           |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |              +- ExpressionStatement[]
          |                 +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                    |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                    +- ArgumentList[@Empty = false, @Size = 1]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Sorry?", @Empty = false, @Image = "\"Sorry?\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "Jep441_PatternMatchingForSwitch$CardClassification", @CanonicalName = "Jep441_PatternMatchingForSwitch.CardClassification", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "CardClassification", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{sealed, abstract, static}", @ExplicitModifiers = "{sealed}"]
          |  +- PermitsList[@Empty = false, @Size = 2]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Tarot"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Tarot"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- EnumDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep441_PatternMatchingForSwitch$Suit", @CanonicalName = "Jep441_PatternMatchingForSwitch.Suit", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = true, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "Suit", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PUBLIC]
          |  +- ModifierList[@EffectiveModifiers = "{public, static, final}", @ExplicitModifiers = "{public}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "CardClassification"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "CardClassification"]
          |  +- EnumBody[@Empty = false, @SeparatorSemi = false, @Size = 4, @TrailingComma = false]
          |     +- EnumConstant[@AnonymousClass = false, @EffectiveVisibility = Visibility.V_PACKAGE, @Image = "CLUBS", @MethodName = "new", @Name = "CLUBS", @Visibility = Visibility.V_PUBLIC]
          |     |  +- ModifierList[@EffectiveModifiers = "{public, static, final}", @ExplicitModifiers = "{}"]
@@ -289,7 +289,7 @@
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep441_PatternMatchingForSwitch$Tarot", @CanonicalName = "Jep441_PatternMatchingForSwitch.Tarot", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Tarot", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "CardClassification"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "CardClassification"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "exhaustiveSwitchWithoutEnumSupport", @Name = "exhaustiveSwitchWithoutEnumSupport", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
@@ -297,7 +297,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "CardClassification"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "CardClassification"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -306,88 +306,88 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "CLUBS", @Name = "CLUBS", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |              +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s clubs", @Empty = false, @Image = "\"It\'s clubs\"", @Length = 10, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "DIAMONDS", @Name = "DIAMONDS", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |              +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s diamonds", @Empty = false, @Image = "\"It\'s diamonds\"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "HEARTS", @Name = "HEARTS", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |              +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s hearts", @Empty = false, @Image = "\"It\'s hearts\"", @Length = 11, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s spades", @Empty = false, @Image = "\"It\'s spades\"", @Length = 11, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |           +- SwitchLabel[@Default = false]
          |           |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Tarot"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "Tarot"]
          |           |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |              +- ExpressionStatement[]
          |                 +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                    |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                    +- ArgumentList[@Empty = false, @Size = 1]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s a tarot", @Empty = false, @Image = "\"It\'s a tarot\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "exhaustiveSwitchWithBetterEnumSupport", @Name = "exhaustiveSwitchWithBetterEnumSupport", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -396,7 +396,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "CardClassification"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "CardClassification"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -405,77 +405,77 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "CLUBS", @Name = "CLUBS", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |        +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s clubs", @Empty = false, @Image = "\"It\'s clubs\"", @Length = 10, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "DIAMONDS", @Name = "DIAMONDS", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |        +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s diamonds", @Empty = false, @Image = "\"It\'s diamonds\"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "HEARTS", @Name = "HEARTS", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |        +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s hearts", @Empty = false, @Image = "\"It\'s hearts\"", @Length = 11, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "SPADES", @Name = "SPADES", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Suit"]
+         |        |  |        +- ClassType[@FullyQualified = false, @SimpleName = "Suit"]
          |        |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s spades", @Empty = false, @Image = "\"It\'s spades\"", @Length = 11, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |           +- SwitchLabel[@Default = false]
          |           |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |           |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Tarot"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "Tarot"]
          |           |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |              +- ExpressionStatement[]
          |                 +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                    |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                    +- ArgumentList[@Empty = false, @Size = 1]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "It\'s a tarot", @Empty = false, @Image = "\"It\'s a tarot\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "Jep441_PatternMatchingForSwitch$Currency", @CanonicalName = "Jep441_PatternMatchingForSwitch.Currency", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "Currency", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{sealed, abstract, static}", @ExplicitModifiers = "{sealed}"]
          |  +- PermitsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Coin"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Coin"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- EnumDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep441_PatternMatchingForSwitch$Coin", @CanonicalName = "Jep441_PatternMatchingForSwitch.Coin", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = true, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = false, @SimpleName = "Coin", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Currency"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Currency"]
          |  +- EnumBody[@Empty = false, @SeparatorSemi = false, @Size = 2, @TrailingComma = false]
          |     +- EnumConstant[@AnonymousClass = false, @EffectiveVisibility = Visibility.V_PACKAGE, @Image = "HEADS", @MethodName = "new", @Name = "HEADS", @Visibility = Visibility.V_PUBLIC]
          |     |  +- ModifierList[@EffectiveModifiers = "{public, static, final}", @ExplicitModifiers = "{}"]
@@ -489,7 +489,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Currency"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Currency"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -498,26 +498,26 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "HEADS", @Name = "HEADS", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Coin"]
+         |        |  |        +- ClassType[@FullyQualified = false, @SimpleName = "Coin"]
          |        |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Heads", @Empty = false, @Image = "\"Heads\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |           +- SwitchLabel[@Default = false]
          |           |  +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "TAILS", @Name = "TAILS", @ParenthesisDepth = 0, @Parenthesized = false]
          |           |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Coin"]
+         |           |        +- ClassType[@FullyQualified = false, @SimpleName = "Coin"]
          |           +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |              +- ExpressionStatement[]
          |                 +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                    |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                    |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                    |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                    +- ArgumentList[@Empty = false, @Size = 1]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Tails", @Empty = false, @Image = "\"Tails\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "goodEnumSwitch2", @Name = "goodEnumSwitch2", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -526,7 +526,7 @@
             +- FormalParameters[@Empty = false, @Size = 1]
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Coin"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "Coin"]
             |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 1, @containsComment = false]
                +- SwitchStatement[@DefaultCase = false, @EnumSwitch = true, @ExhaustiveEnumSwitch = true, @FallthroughSwitch = false]
@@ -539,19 +539,19 @@
                   |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |           +- ArgumentList[@Empty = false, @Size = 1]
                   |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Heads", @Empty = false, @Image = "\"Heads\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   +- SwitchArrowBranch[@Default = false]
                      +- SwitchLabel[@Default = false]
                      |  +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "TAILS", @Name = "TAILS", @ParenthesisDepth = 0, @Parenthesized = false]
                      |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Coin"]
+                     |        +- ClassType[@FullyQualified = false, @SimpleName = "Coin"]
                      +- Block[@Empty = false, @Size = 1, @containsComment = false]
                         +- ExpressionStatement[]
                            +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                               +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                               |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                               +- ArgumentList[@Empty = false, @Size = 1]
                                  +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Tails", @Empty = false, @Image = "\"Tails\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/PatternsInSwitchLabels.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/PatternsInSwitchLabels.txt
index 938425e62b..a801d84fce 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/PatternsInSwitchLabels.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/PatternsInSwitchLabels.txt
@@ -9,20 +9,20 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 3, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "o"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "123L", @IntLiteral = false, @Integral = true, @LongLiteral = true, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 123.0, @ValueAsFloat = 123.0, @ValueAsInt = 123, @ValueAsLong = 123]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "formatted"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "formatted", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- SwitchExpression[@CompileTimeConstant = false, @DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -31,11 +31,11 @@
                |        |  +- SwitchLabel[@Default = false]
                |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+               |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
                |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |     +- ArgumentList[@Empty = false, @Size = 2]
                |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "int %d", @Empty = false, @Image = "\"int %d\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |        |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -43,11 +43,11 @@
                |        |  +- SwitchLabel[@Default = false]
                |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Long"]
+               |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Long"]
                |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "l", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |     +- ArgumentList[@Empty = false, @Size = 2]
                |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "long %d", @Empty = false, @Image = "\"long %d\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |        |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "l", @Name = "l", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -55,11 +55,11 @@
                |        |  +- SwitchLabel[@Default = false]
                |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Double"]
+               |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Double"]
                |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |     +- ArgumentList[@Empty = false, @Size = 2]
                |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "double %f", @Empty = false, @Image = "\"double %f\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |        |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "d", @Name = "d", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -67,11 +67,11 @@
                |        |  +- SwitchLabel[@Default = false]
                |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |     +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |        |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |        |     +- ArgumentList[@Empty = false, @Size = 2]
                |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String %s", @Empty = false, @Image = "\"String %s\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |        |        +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -84,6 +84,6 @@
                   +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "formatted", @Name = "formatted", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RecordPatterns.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RecordPatterns.txt
index f5008407aa..ae9ecee4ce 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RecordPatterns.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RecordPatterns.txt
@@ -31,11 +31,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatterns$Rectangle", @CanonicalName = "RecordPatterns.Rectangle", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Rectangle", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -43,11 +43,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "upperLeft", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lowerRight", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "printSum1", @Name = "printSum1", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -56,7 +56,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -65,7 +65,7 @@
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 3, @containsComment = false]
          |           +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -88,7 +88,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x", @Name = "x", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -99,7 +99,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -107,7 +107,7 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "o", @Name = "o", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -122,7 +122,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x", @Name = "x", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -133,7 +133,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -141,22 +141,22 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |           |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "ul", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lr", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- MethodCall[@CompileTimeConstant = false, @Image = "c", @MethodName = "c", @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- AmbiguousName[@CompileTimeConstant = false, @Image = "ul", @Name = "ul", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -167,7 +167,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -175,34 +175,34 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |           |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |           |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |        |           |        +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |        |           |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lr", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "c", @Name = "c", @ParenthesisDepth = 0, @Parenthesized = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 6, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "createRectangle", @Name = "createRectangle", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  +- FormalParameters[@Empty = false, @Size = 6]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -214,7 +214,7 @@
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "y1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "c1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -226,31 +226,31 @@
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "y2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "c2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "r"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |     |        +- ArgumentList[@Empty = false, @Size = 2]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |     |           |  +- ArgumentList[@Empty = false, @Size = 2]
          |     |           |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |     |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |     |           |     |  +- ArgumentList[@Empty = false, @Size = 2]
          |     |           |     |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x1", @Name = "x1", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |     |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "y1", @Name = "y1", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "c1", @Name = "c1", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |     |              +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |     |              +- ArgumentList[@Empty = false, @Size = 2]
          |     |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |                 |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |     |                 |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |     |                 |  +- ArgumentList[@Empty = false, @Size = 2]
          |     |                 |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x2", @Name = "x2", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 |     +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "y2", @Name = "y2", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -263,7 +263,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -271,36 +271,36 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |           |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |           |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |           |     |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |     |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |           |     |     |  +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |           |     |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           |     |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |           |     |        +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |           |     |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "y", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |           |        +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |           |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "lr", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Upper-left corner: ", @Empty = false, @Image = "\"Upper-left corner: \"", @Length = 19, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -310,11 +310,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "y", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "nestedPatternsCanFailToMatch", @Name = "nestedPatternsCanFailToMatch", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -324,11 +324,11 @@
          |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "p"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |     |        +- ArgumentList[@Empty = false, @Size = 2]
          |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
          |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "42", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 42.0, @ValueAsFloat = 42.0, @ValueAsInt = 42, @ValueAsLong = 42]
@@ -337,22 +337,22 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "p", @Name = "p", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |           |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |        |  +- ExpressionStatement[]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -364,7 +364,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Not a pair of strings", @Empty = false, @Image = "\"Not a pair of strings\"", @Length = 21, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatterns$Box", @CanonicalName = "RecordPatterns.Box", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Box", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
@@ -374,7 +374,7 @@
          |  +- RecordComponentList[@Empty = false, @Size = 1, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "test1a", @Name = "test1a", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -383,9 +383,9 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -393,20 +393,20 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |        |        +- PatternList[@Empty = false, @Size = 1]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -417,9 +417,9 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -427,20 +427,20 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |        +- PatternList[@Empty = false, @Size = 1]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -451,9 +451,9 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -461,18 +461,18 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        +- PatternList[@Empty = false, @Size = 1]
          |        |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -483,11 +483,11 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- IfStatement[@Else = false]
@@ -495,25 +495,25 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |        |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |        |        |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        |        |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        |        +- PatternList[@Empty = false, @Size = 1]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |              +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |              +- PatternList[@Empty = false, @Size = 1]
          |        |                 +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |                    +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+         |        |                    +- ClassType[@FullyQualified = false, @SimpleName = "var"]
          |        |                    +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ExpressionStatement[]
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -524,11 +524,11 @@
             +- FormalParameters[@Empty = false, @Size = 1]
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-            |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+            |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
             |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+            |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
             |     |        +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-            |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |           +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "bo", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 1, @containsComment = false]
                +- IfStatement[@Else = false]
@@ -536,21 +536,21 @@
                   |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "bo", @Name = "bo", @ParenthesisDepth = 0, @Parenthesized = false]
                   |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- RecordPattern[@ParenthesisDepth = 0]
-                  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+                  |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
                   |        +- PatternList[@Empty = false, @Size = 1]
                   |           +- RecordPattern[@ParenthesisDepth = 0]
-                  |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+                  |              +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
                   |              +- PatternList[@Empty = false, @Size = 1]
                   |                 +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |                    +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "var"]
+                  |                    +- ClassType[@FullyQualified = false, @SimpleName = "var"]
                   |                    +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   +- Block[@Empty = false, @Size = 1, @containsComment = false]
                      +- ExpressionStatement[]
                         +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                            +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                            |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                            +- ArgumentList[@Empty = false, @Size = 1]
                               +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                                  +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "String ", @Empty = false, @Image = "\"String \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RecordPatternsExhaustiveSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RecordPatternsExhaustiveSwitch.txt
index db0ea9f29c..74e48e65c2 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RecordPatternsExhaustiveSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RecordPatternsExhaustiveSwitch.txt
@@ -8,23 +8,23 @@
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$B", @CanonicalName = "RecordPatternsExhaustiveSwitch.B", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "B", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |  +- ExtendsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "A"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$I", @CanonicalName = "RecordPatternsExhaustiveSwitch.I", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = true, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = false, @RegularInterface = true, @SimpleName = "I", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{sealed, abstract, static}", @ExplicitModifiers = "{sealed}"]
          |  +- PermitsList[@Empty = false, @Size = 2]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "C"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "D"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$C", @CanonicalName = "RecordPatternsExhaustiveSwitch.C", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "C", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$D", @CanonicalName = "RecordPatternsExhaustiveSwitch.D", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "D", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RecordPatternsExhaustiveSwitch$Pair", @CanonicalName = "RecordPatternsExhaustiveSwitch.Pair", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Pair", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{}"]
@@ -33,11 +33,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "x", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "y", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "test", @Name = "test", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -47,17 +47,17 @@
             +- Block[@Empty = false, @Size = 5, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "p1"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |  |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "p2"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- NullLiteral[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -66,64 +66,64 @@
                |  +- SwitchArrowBranch[@Default = false]
                |  |  +- SwitchLabel[@Default = false]
                |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-               |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  |  |     +- PatternList[@Empty = false, @Size = 2]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+               |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "B"]
                |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "b", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |  |     +- ArgumentList[@Empty = false, @Size = 1]
                |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |  +- SwitchArrowBranch[@Default = false]
                |  |  +- SwitchLabel[@Default = false]
                |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-               |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  |  |     +- PatternList[@Empty = false, @Size = 2]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "B"]
+               |  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "B"]
                |  |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "b", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |  |     +- ArgumentList[@Empty = false, @Size = 1]
                |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |  +- SwitchArrowBranch[@Default = false]
                |     +- SwitchLabel[@Default = false]
                |     |  +- RecordPattern[@ParenthesisDepth = 0]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |     |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |     |     +- PatternList[@Empty = false, @Size = 2]
                |     |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |     |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |     |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a1", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |     |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "A"]
+               |     |           +- ClassType[@FullyQualified = false, @SimpleName = "A"]
                |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "a2", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |        +- ArgumentList[@Empty = false, @Size = 1]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "exhaustive now", @Empty = false, @Image = "\"exhaustive now\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -131,43 +131,43 @@
                |  +- SwitchArrowBranch[@Default = false]
                |  |  +- SwitchLabel[@Default = false]
                |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-               |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |  |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |  |  |     +- PatternList[@Empty = false, @Size = 2]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |  |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+               |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |  |     +- ArgumentList[@Empty = false, @Size = 1]
                |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                |  +- SwitchArrowBranch[@Default = false]
                |     +- SwitchLabel[@Default = false]
                |     |  +- RecordPattern[@ParenthesisDepth = 0]
-               |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+               |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                |     |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-               |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |     |     +- PatternList[@Empty = false, @Size = 2]
                |     |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |     |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+               |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                |     |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                |     |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+               |     |           +- ClassType[@FullyQualified = false, @SimpleName = "D"]
                |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |        +- ArgumentList[@Empty = false, @Size = 1]
                |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -175,63 +175,63 @@
                   +- SwitchArrowBranch[@Default = false]
                   |  +- SwitchLabel[@Default = false]
                   |  |  +- RecordPattern[@ParenthesisDepth = 0]
-                  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+                  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                   |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+                  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                   |  |     +- PatternList[@Empty = false, @Size = 2]
                   |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+                  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                   |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+                  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                   |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |     +- ArgumentList[@Empty = false, @Size = 1]
                   |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   +- SwitchArrowBranch[@Default = false]
                   |  +- SwitchLabel[@Default = false]
                   |  |  +- RecordPattern[@ParenthesisDepth = 0]
-                  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+                  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                   |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                  |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+                  |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                   |  |     +- PatternList[@Empty = false, @Size = 2]
                   |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |  |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+                  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "D"]
                   |  |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                   |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "C"]
+                  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "C"]
                   |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                   |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                   |     +- ArgumentList[@Empty = false, @Size = 1]
                   |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                   +- SwitchArrowBranch[@Default = false]
                      +- SwitchLabel[@Default = false]
                      |  +- RecordPattern[@ParenthesisDepth = 0]
-                     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Pair"]
+                     |     +- ClassType[@FullyQualified = false, @SimpleName = "Pair"]
                      |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-                     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "I"]
+                     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "I"]
                      |     +- PatternList[@Empty = false, @Size = 2]
                      |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                      |        |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+                     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "D"]
                      |        |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d1", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                      |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
                      |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "D"]
+                     |           +- ClassType[@FullyQualified = false, @SimpleName = "D"]
                      |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "d2", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                      +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                         +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                         |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+                        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                         +- ArgumentList[@Empty = false, @Size = 1]
                            +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RefiningPatternsInSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RefiningPatternsInSwitch.txt
index 7fcb726cda..7eddedd5d9 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RefiningPatternsInSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/RefiningPatternsInSwitch.txt
@@ -8,12 +8,12 @@
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RefiningPatternsInSwitch$Rectangle", @CanonicalName = "RefiningPatternsInSwitch.Rectangle", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Rectangle", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
          |  +- ExtendsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "RefiningPatternsInSwitch$Triangle", @CanonicalName = "RefiningPatternsInSwitch.Triangle", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Triangle", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
          |  +- ExtendsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  +- ClassOrInterfaceBody[@Empty = false, @Size = 3]
          |     +- FieldDeclaration[@EffectiveVisibility = Visibility.V_PRIVATE, @Static = false, @Visibility = Visibility.V_PRIVATE]
          |     |  +- ModifierList[@EffectiveModifiers = "{private}", @ExplicitModifiers = "{private}"]
@@ -46,7 +46,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -59,7 +59,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- IfStatement[@Else = false]
          |        |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -72,7 +72,7 @@
          |        |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Large triangle", @Empty = false, @Image = "\"Large triangle\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |        +- BreakStatement[@Label = null]
@@ -82,7 +82,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A shape, possibly a small triangle", @Empty = false, @Image = "\"A shape, possibly a small triangle\"", @Length = 34, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testTriangleRefined", @Name = "testTriangleRefined", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -91,7 +91,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -105,7 +105,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -116,7 +116,7 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Large triangle", @Empty = false, @Image = "\"Large triangle\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -124,7 +124,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "A shape, possibly a small triangle", @Empty = false, @Image = "\"A shape, possibly a small triangle\"", @Length = 34, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "testTriangleRefined2", @Name = "testTriangleRefined2", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -133,7 +133,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Shape"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Shape"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -147,7 +147,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.GT, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -158,19 +158,19 @@
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Large triangle", @Empty = false, @Image = "\"Large triangle\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "t", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Small triangle", @Empty = false, @Image = "\"Small triangle\"", @Length = 14, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = true]
@@ -178,7 +178,7 @@
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |              +- ArgumentList[@Empty = false, @Size = 1]
          |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Non-triangle", @Empty = false, @Image = "\"Non-triangle\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -188,36 +188,36 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
             +- Block[@Empty = false, @Size = 12, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "large"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "large", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+               |        +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
                |        +- ArgumentList[@Empty = false, @Size = 1]
                |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "200", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 200.0, @ValueAsFloat = 200.0, @ValueAsInt = 200, @ValueAsLong = 200]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "small"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "small", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Triangle"]
+               |        +- ClassType[@FullyQualified = false, @SimpleName = "Triangle"]
                |        +- ArgumentList[@Empty = false, @Size = 1]
                |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "10", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 10.0, @ValueAsFloat = 10.0, @ValueAsInt = 10, @ValueAsLong = 10]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "rect"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "rect", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-               |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+               |        +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
                |        +- ArgumentList[@Empty = true, @Size = 0]
                +- ExpressionStatement[]
                |  +- MethodCall[@CompileTimeConstant = false, @Image = "testTriangle", @MethodName = "testTriangle", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/ScopeOfPatternVariableDeclarations.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/ScopeOfPatternVariableDeclarations.txt
index a5f3e02e67..12606cd085 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/ScopeOfPatternVariableDeclarations.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21/ScopeOfPatternVariableDeclarations.txt
@@ -8,7 +8,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "obj", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -17,7 +17,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Character"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Character"]
          |        |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -29,7 +29,7 @@
          |        |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |     +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Ding!", @Empty = false, @Image = "\"Ding!\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |  +- BreakStatement[@Label = null]
@@ -42,7 +42,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -51,7 +51,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Character"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Character"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- Block[@Empty = false, @Size = 2, @containsComment = false]
          |        |     +- IfStatement[@Else = false]
@@ -65,25 +65,25 @@
          |        |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |     |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Ding!", @Empty = false, @Image = "\"Ding!\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |     +- ExpressionStatement[]
          |        |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Character", @Empty = false, @Image = "\"Character\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "i", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- ThrowStatement[]
          |        |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IllegalStateException"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "IllegalStateException"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Invalid Integer argument of value ", @Empty = false, @Image = "\"Invalid Integer argument of value \"", @Length = 34, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -100,7 +100,7 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Object"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Object"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "o", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- SwitchStatement[@DefaultCase = true, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -109,7 +109,7 @@
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Character"]
+         |        |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Character"]
          |        |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  +- IfStatement[@Else = false]
          |        |  |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -122,7 +122,7 @@
          |        |  |        +- MethodCall[@CompileTimeConstant = false, @Image = "print", @MethodName = "print", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Ding ", @Empty = false, @Image = "\"Ding \"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |  +- IfStatement[@Else = false]
@@ -136,14 +136,14 @@
          |        |  |        +- MethodCall[@CompileTimeConstant = false, @Image = "print", @MethodName = "print", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |  |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |  |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |  |           +- ArgumentList[@Empty = false, @Size = 1]
          |        |  |              +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Tab ", @Empty = false, @Image = "\"Tab \"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        |  +- ExpressionStatement[]
          |        |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |        |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |        |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |        |        +- ArgumentList[@Empty = false, @Size = 1]
          |        |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "character", @Empty = false, @Image = "\"character\"", @Length = 9, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |        +- SwitchFallthroughBranch[@Default = true]
@@ -152,7 +152,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "fall-through", @Empty = false, @Image = "\"fall-through\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 1, @EffectiveVisibility = Visibility.V_PUBLIC, @Final = false, @Image = "main", @MainMethod = true, @Name = "main", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
@@ -162,7 +162,7 @@
             |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
             |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
             |     +- ArrayType[@ArrayDepth = 1]
-            |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+            |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
             |     |  +- ArrayDimensions[@Empty = false, @Size = 1]
             |     |     +- ArrayTypeDim[@Varargs = false]
             |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "args", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -184,14 +184,14 @@
                |  +- CatchClause[]
                |     +- CatchParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Multicatch = false, @Name = "e", @Visibility = Visibility.V_PACKAGE]
                |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "IllegalStateException"]
+               |     |  +- ClassType[@FullyQualified = false, @SimpleName = "IllegalStateException"]
                |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = true, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "e", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
                |     +- Block[@Empty = false, @Size = 1, @containsComment = false]
                |        +- ExpressionStatement[]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "e", @Name = "e", @ParenthesisDepth = 0, @Parenthesized = false]
                +- ExpressionStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep430_StringTemplates.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep430_StringTemplates.txt
index 989cb9a7b7..395dcff7a2 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep430_StringTemplates.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep430_StringTemplates.txt
@@ -12,15 +12,15 @@
          |  +- RecordComponentList[@Empty = false, @Size = 3, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "date", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "time", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "ipAddress", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "STRTemplateProcessor", @Name = "STRTemplateProcessor", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -30,19 +30,19 @@
          |  +- Block[@Empty = false, @Size = 19, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "firstName"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "firstName", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Bill", @Empty = false, @Image = "\"Bill\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "lastName"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "lastName", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Duck", @Empty = false, @Image = "\"Duck\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "fullName"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "fullName", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -55,7 +55,7 @@
          |     |           +- TemplateFragment[@Image = "}\""]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "sortName"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "sortName", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -77,7 +77,7 @@
          |     |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "20", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 20.0, @ValueAsFloat = 20.0, @ValueAsInt = 20, @ValueAsLong = 20]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "s1"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -94,7 +94,7 @@
          |     |           +- TemplateFragment[@Image = "}\""]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "s2"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -106,18 +106,18 @@
          |     |           +- TemplateFragment[@Image = "} waiting for you!\""]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Request"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Request"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "req"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "req", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Request"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Request"]
          |     |        +- ArgumentList[@Empty = false, @Size = 3]
          |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "2022-03-25", @Empty = false, @Image = "\"2022-03-25\"", @Length = 10, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "15:34", @Empty = false, @Image = "\"15:34\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "8.8.8.8", @Empty = false, @Image = "\"8.8.8.8\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "t"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "t", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -135,22 +135,22 @@
          |     |           +- TemplateFragment[@Image = "}\""]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "filePath"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "filePath", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "tmp.dat", @Empty = false, @Image = "\"tmp.dat\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "File"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "File"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "file"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "file", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "File"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "File"]
          |     |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |           +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "filePath", @Name = "filePath", @ParenthesisDepth = 0, @Parenthesized = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "old"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "old", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -169,7 +169,7 @@
          |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = " exist", @Empty = false, @Image = "\" exist\"", @Length = 6, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "msg"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "msg", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -187,7 +187,7 @@
          |     |           +- TemplateFragment[@Image = "} exist\""]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "time"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "time", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -197,13 +197,13 @@
          |     |           +- MethodCall[@CompileTimeConstant = false, @Image = "format", @MethodName = "format", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- MethodCall[@CompileTimeConstant = false, @Image = "ofPattern", @MethodName = "ofPattern", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "DateTimeFormatter"]
+         |     |           |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "DateTimeFormatter"]
          |     |           |  |  +- ArgumentList[@Empty = false, @Size = 1]
          |     |           |  |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "HH:mm:ss", @Empty = false, @Image = "\"HH:mm:ss\"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |           |  +- ArgumentList[@Empty = false, @Size = 1]
          |     |           |     +- MethodCall[@CompileTimeConstant = false, @Image = "now", @MethodName = "now", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "LocalTime"]
+         |     |           |        |  +- ClassType[@FullyQualified = false, @SimpleName = "LocalTime"]
          |     |           |        +- ArgumentList[@Empty = true, @Size = 0]
          |     |           +- TemplateFragment[@Image = "} right now\""]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -214,7 +214,7 @@
          |     |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "0", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 0.0, @ValueAsFloat = 0.0, @ValueAsInt = 0, @ValueAsLong = 0]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "data"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "data", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -236,7 +236,7 @@
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |     |  +- ArrayType[@ArrayDepth = 1]
-         |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |     |  |     +- ArrayTypeDim[@Varargs = false]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "fruit"]
@@ -247,7 +247,7 @@
          |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "peaches", @Empty = false, @Image = "\"peaches\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "s3"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s3", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -273,7 +273,7 @@
          |     |           +- TemplateFragment[@Image = "}\""]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        +- VariableDeclarator[@Initializer = true, @Name = "s4"]
          |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s4", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -299,7 +299,7 @@
          |                 +- TemplateFragment[@Image = "}\""]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "getOfferType", @Name = "getOfferType", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
-         |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  +- FormalParameters[@Empty = true, @Size = 0]
          |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     +- ReturnStatement[]
@@ -311,19 +311,19 @@
          |  +- Block[@Empty = false, @Size = 7, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "title"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "title", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "My Web Page", @Empty = false, @Image = "\"My Web Page\"", @Length = 11, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "text"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "text", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Hello, world", @Empty = false, @Image = "\"Hello, world\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "html"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "html", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -336,25 +336,25 @@
          |     |           +- TemplateFragment[@Image = "}
\n          \n        \n        \"\"\""]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "name"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "name", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Joan Smith", @Empty = false, @Image = "\"Joan Smith\"", @Length = 10, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "phone"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "phone", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "555-123-4567", @Empty = false, @Image = "\"555-123-4567\"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "address"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "address", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "1 Maple Drive, Anytown", @Empty = false, @Image = "\"1 Maple Drive, Anytown\"", @Length = 22, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        +- VariableDeclarator[@Initializer = true, @Name = "json"]
          |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "json", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -459,7 +459,7 @@
          |     |     +- RecordComponentList[@Empty = false, @Size = 3, @Varargs = false]
          |     |     |  +- RecordComponent[@EffectiveVisibility = Visibility.V_LOCAL, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |     |     |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |     |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |     |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "name", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |     |     |  +- RecordComponent[@EffectiveVisibility = Visibility.V_LOCAL, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |     |     |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
@@ -483,38 +483,38 @@
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
          |     |  +- ArrayType[@ArrayDepth = 1]
-         |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |     |  |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |     |  |     +- ArrayTypeDim[@Varargs = false]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "zone"]
          |     |     +- VariableDeclaratorId[@ArrayType = true, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "zone", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ArrayAllocation[@ArrayDepth = 1, @CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- ArrayType[@ArrayDepth = 1]
-         |     |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |     |        |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |     |        |  +- ArrayDimensions[@Empty = false, @Size = 1]
          |     |        |     +- ArrayTypeDim[@Varargs = false]
          |     |        +- ArrayInitializer[@CompileTimeConstant = false, @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |     |           |  +- ArgumentList[@Empty = false, @Size = 3]
          |     |           |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Alfa", @Empty = false, @Image = "\"Alfa\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |           |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = true, @FloatLiteral = false, @Image = "17.8", @IntLiteral = false, @Integral = false, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 17.8, @ValueAsFloat = 17.8, @ValueAsInt = 17, @ValueAsLong = 17]
          |     |           |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = true, @FloatLiteral = false, @Image = "31.4", @IntLiteral = false, @Integral = false, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 31.4, @ValueAsFloat = 31.4, @ValueAsInt = 31, @ValueAsLong = 31]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |     |           |  +- ArgumentList[@Empty = false, @Size = 3]
          |     |           |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Bravo", @Empty = false, @Image = "\"Bravo\"", @Length = 5, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |           |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = true, @FloatLiteral = false, @Image = "9.6", @IntLiteral = false, @Integral = false, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 9.6, @ValueAsFloat = 9.6, @ValueAsInt = 9, @ValueAsLong = 9]
          |     |           |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = true, @FloatLiteral = false, @Image = "12.4", @IntLiteral = false, @Integral = false, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 12.4, @ValueAsFloat = 12.4, @ValueAsInt = 12, @ValueAsLong = 12]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Rectangle"]
+         |     |              +- ClassType[@FullyQualified = false, @SimpleName = "Rectangle"]
          |     |              +- ArgumentList[@Empty = false, @Size = 3]
          |     |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Charlie", @Empty = false, @Image = "\"Charlie\"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |                 +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = true, @FloatLiteral = false, @Image = "7.1", @IntLiteral = false, @Integral = false, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 7.1, @ValueAsFloat = 7.1, @ValueAsInt = 7, @ValueAsLong = 7]
          |     |                 +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = true, @FloatLiteral = false, @Image = "11.23", @IntLiteral = false, @Integral = false, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 11.23, @ValueAsFloat = 11.23, @ValueAsInt = 11, @ValueAsLong = 11]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        +- VariableDeclarator[@Initializer = true, @Name = "table"]
          |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "table", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = false]
@@ -614,13 +614,13 @@
          |  +- Block[@Empty = false, @Size = 3, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "name"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "name", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Joan", @Empty = false, @Image = "\"Joan\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "StringTemplate"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "StringTemplate"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "st"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "st", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = false]
@@ -631,7 +631,7 @@
          |     |           +- TemplateFragment[@Image = "}\""]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        +- VariableDeclarator[@Initializer = true, @Name = "info"]
          |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "info", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "process", @MethodName = "process", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -643,7 +643,7 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "firstName", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
@@ -657,7 +657,7 @@
          |  +- Block[@Empty = false, @Size = 3, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "s1"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -665,17 +665,17 @@
          |     |        +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Welcome to your account", @Empty = false, @Image = "\"Welcome to your account\"", @Length = 23, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "User"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "User"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "user"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "user", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "User"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "User"]
          |     |        +- ArgumentList[@Empty = false, @Size = 2]
          |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Lisa", @Empty = false, @Image = "\"Lisa\"", @Length = 4, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
          |     |           +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "12345", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 12345.0, @ValueAsFloat = 12345.0, @ValueAsInt = 12345, @ValueAsLong = 12345]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+         |        +- ClassType[@FullyQualified = false, @SimpleName = "String"]
          |        +- VariableDeclarator[@Initializer = true, @Name = "s2"]
          |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s2", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |           +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
@@ -697,7 +697,7 @@
             +- Block[@Empty = false, @Size = 1, @containsComment = false]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                   +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-                  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                   +- VariableDeclarator[@Initializer = true, @Name = "s1"]
                      +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s1", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                      +- TemplateExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false, @StringTemplate = true]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep443_UnnamedPatternsAndVariables.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep443_UnnamedPatternsAndVariables.txt
index 7c275d88dc..9972236d59 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep443_UnnamedPatternsAndVariables.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep443_UnnamedPatternsAndVariables.txt
@@ -35,11 +35,11 @@
          |  +- RecordComponentList[@Empty = false, @Size = 2, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |  |  +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "c", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "unnamedPatterns1", @Name = "unnamedPatterns1", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -49,41 +49,41 @@
          |  +- Block[@Empty = false, @Size = 3, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "r"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "r", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |     |        +- ArgumentList[@Empty = false, @Size = 2]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |     |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |     |           |  +- ArgumentList[@Empty = false, @Size = 2]
          |     |           |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "3", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 3.0, @ValueAsFloat = 3.0, @ValueAsInt = 3, @ValueAsLong = 3]
          |     |           |     +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "4", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 4.0, @ValueAsFloat = 4.0, @ValueAsInt = 4, @ValueAsLong = 4]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "GREEN", @Name = "GREEN", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |              +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |                 +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |     |                 +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |     +- IfStatement[@Else = false]
          |     |  +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.INSTANCEOF, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- RecordPattern[@ParenthesisDepth = 0]
-         |     |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |     |  |        +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |     |  |        +- PatternList[@Empty = false, @Size = 2]
          |     |  |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |           |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |     |  |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |     |  |           |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "p", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |           +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Color"]
+         |     |  |              +- ClassType[@FullyQualified = false, @SimpleName = "Color"]
          |     |  |              +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |     |     +- ExpressionStatement[]
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -99,10 +99,10 @@
          |        |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "r", @Name = "r", @ParenthesisDepth = 0, @Parenthesized = false]
          |        |  +- PatternExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
          |        |     +- RecordPattern[@ParenthesisDepth = 0]
-         |        |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
+         |        |        +- ClassType[@FullyQualified = false, @SimpleName = "ColoredPoint"]
          |        |        +- PatternList[@Empty = false, @Size = 2]
          |        |           +- RecordPattern[@ParenthesisDepth = 0]
-         |        |           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |        |           |  +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |        |           |  +- PatternList[@Empty = false, @Size = 2]
          |        |           |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |           |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -118,7 +118,7 @@
          |              +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |                 |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |                 |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |                 |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |                 +- ArgumentList[@Empty = false, @Size = 1]
          |                    +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -128,34 +128,34 @@
          +- ClassOrInterfaceDeclaration[@Abstract = true, @Annotation = false, @Anonymous = false, @BinaryName = "Jep443_UnamedPatternsAndVariables$Ball", @CanonicalName = "Jep443_UnamedPatternsAndVariables.Ball", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "Ball", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{sealed, abstract}", @ExplicitModifiers = "{sealed, abstract}"]
          |  +- PermitsList[@Empty = false, @Size = 3]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "RedBall"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "BlueBall"]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "GreenBall"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "RedBall"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "BlueBall"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "GreenBall"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep443_UnamedPatternsAndVariables$RedBall", @CanonicalName = "Jep443_UnamedPatternsAndVariables.RedBall", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "RedBall", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
          |  +- ExtendsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Ball"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Ball"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep443_UnamedPatternsAndVariables$BlueBall", @CanonicalName = "Jep443_UnamedPatternsAndVariables.BlueBall", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "BlueBall", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
          |  +- ExtendsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Ball"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Ball"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep443_UnamedPatternsAndVariables$GreenBall", @CanonicalName = "Jep443_UnamedPatternsAndVariables.GreenBall", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "GreenBall", @Static = false, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{final}", @ExplicitModifiers = "{final}"]
          |  +- ExtendsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Ball"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Ball"]
          |  +- ClassOrInterfaceBody[@Empty = true, @Size = 0]
          +- RecordDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep443_UnamedPatternsAndVariables$Box", @CanonicalName = "Jep443_UnamedPatternsAndVariables.Box", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = true, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = true, @RegularClass = false, @RegularInterface = false, @SimpleName = "Box", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static, final}", @ExplicitModifiers = "{}"]
          |  +- TypeParameters[@Empty = false, @Size = 1]
          |  |  +- TypeParameter[@Image = "T", @Name = "T", @TypeBound = true]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Ball"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Ball"]
          |  +- RecordComponentList[@Empty = false, @Size = 1, @Varargs = false]
          |  |  +- RecordComponent[@EffectiveVisibility = Visibility.V_PRIVATE, @Varargs = false, @Visibility = Visibility.V_PRIVATE]
          |  |     +- ModifierList[@EffectiveModifiers = "{private, final}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "T"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "T"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PRIVATE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "content", @PatternBinding = false, @RecordComponent = true, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PRIVATE]
          |  +- RecordBody[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "unnamedPatterns2", @Name = "unnamedPatterns2", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
@@ -165,29 +165,29 @@
          |  +- Block[@Empty = false, @Size = 5, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
          |     |  |     +- WildcardType[@LowerBound = false, @UpperBound = true]
-         |     |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Ball"]
+         |     |  |        +- ClassType[@FullyQualified = false, @SimpleName = "Ball"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "b"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "b", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = true, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |     |        |  +- TypeArguments[@Diamond = true, @Empty = true, @Size = 0]
          |     |        +- ArgumentList[@Empty = false, @Size = 1]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "RedBall"]
+         |     |              +- ClassType[@FullyQualified = false, @SimpleName = "RedBall"]
          |     |              +- ArgumentList[@Empty = true, @Size = 0]
          |     +- SwitchStatement[@DefaultCase = false, @EnumSwitch = false, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
          |     |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "b", @Name = "b", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  +- SwitchArrowBranch[@Default = false]
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |     |  |  |     +- PatternList[@Empty = false, @Size = 1]
          |     |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "RedBall"]
+         |     |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "RedBall"]
          |     |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "processBox", @MethodName = "processBox", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
@@ -195,11 +195,11 @@
          |     |  +- SwitchArrowBranch[@Default = false]
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |     |  |  |     +- PatternList[@Empty = false, @Size = 1]
          |     |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "BlueBall"]
+         |     |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "BlueBall"]
          |     |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "processBox", @MethodName = "processBox", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
@@ -207,11 +207,11 @@
          |     |  +- SwitchArrowBranch[@Default = false]
          |     |     +- SwitchLabel[@Default = false]
          |     |     |  +- RecordPattern[@ParenthesisDepth = 0]
-         |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |     |     |     +- PatternList[@Empty = false, @Size = 1]
          |     |     |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |     |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |     |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "GreenBall"]
+         |     |     |           +- ClassType[@FullyQualified = false, @SimpleName = "GreenBall"]
          |     |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- MethodCall[@CompileTimeConstant = false, @Image = "stopProcessing", @MethodName = "stopProcessing", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |        +- ArgumentList[@Empty = true, @Size = 0]
@@ -220,18 +220,18 @@
          |     |  +- SwitchArrowBranch[@Default = false]
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-         |     |  |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |     |  |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |     |  |  |  |  +- PatternList[@Empty = false, @Size = 1]
          |     |  |  |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "RedBall"]
+         |     |  |  |  |        +- ClassType[@FullyQualified = false, @SimpleName = "RedBall"]
          |     |  |  |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |     |  |  |     +- PatternList[@Empty = false, @Size = 1]
          |     |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "BlueBall"]
+         |     |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "BlueBall"]
          |     |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "processBox", @MethodName = "processBox", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- ArgumentList[@Empty = false, @Size = 1]
@@ -239,18 +239,18 @@
          |     |  +- SwitchArrowBranch[@Default = false]
          |     |  |  +- SwitchLabel[@Default = false]
          |     |  |  |  +- RecordPattern[@ParenthesisDepth = 0]
-         |     |  |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |     |  |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |     |  |  |     +- PatternList[@Empty = false, @Size = 1]
          |     |  |  |        +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |     |  |  |           +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  |           +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "GreenBall"]
+         |     |  |  |           +- ClassType[@FullyQualified = false, @SimpleName = "GreenBall"]
          |     |  |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- MethodCall[@CompileTimeConstant = false, @Image = "stopProcessing", @MethodName = "stopProcessing", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |  |     +- ArgumentList[@Empty = true, @Size = 0]
          |     |  +- SwitchArrowBranch[@Default = false]
          |     |     +- SwitchLabel[@Default = false]
          |     |     |  +- RecordPattern[@ParenthesisDepth = 0]
-         |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |     |     |     +- PatternList[@Empty = false, @Size = 1]
          |     |     |        +- UnnamedPattern[@ParenthesisDepth = 0]
          |     |     +- MethodCall[@CompileTimeConstant = false, @Image = "pickAnotherBox", @MethodName = "pickAnotherBox", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -266,18 +266,18 @@
          |        +- SwitchArrowBranch[@Default = false]
          |        |  +- SwitchLabel[@Default = false]
          |        |  |  +- RecordPattern[@ParenthesisDepth = 0]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |  |  |  +- PatternList[@Empty = false, @Size = 1]
          |        |  |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "RedBall"]
+         |        |  |  |        +- ClassType[@FullyQualified = false, @SimpleName = "RedBall"]
          |        |  |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- RecordPattern[@ParenthesisDepth = 0]
-         |        |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |        |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |        |  |  |  +- PatternList[@Empty = false, @Size = 1]
          |        |  |  |     +- TypePattern[@EffectiveVisibility = Visibility.V_PACKAGE, @ParenthesisDepth = 0, @Visibility = Visibility.V_PACKAGE]
          |        |  |  |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |        |  |  |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "BlueBall"]
+         |        |  |  |        +- ClassType[@FullyQualified = false, @SimpleName = "BlueBall"]
          |        |  |  |        +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = true, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |        |  |  +- Guard[]
          |        |  |     +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.EQ, @ParenthesisDepth = 0, @Parenthesized = false]
@@ -289,7 +289,7 @@
          |        +- SwitchArrowBranch[@Default = false]
          |           +- SwitchLabel[@Default = false]
          |           |  +- RecordPattern[@ParenthesisDepth = 0]
-         |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |           |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |           |     +- PatternList[@Empty = false, @Size = 1]
          |           |        +- UnnamedPattern[@ParenthesisDepth = 0]
          |           +- MethodCall[@CompileTimeConstant = false, @Image = "pickAnotherBox", @MethodName = "pickAnotherBox", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -300,10 +300,10 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Box"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Box"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
          |  |     |     +- WildcardType[@LowerBound = false, @UpperBound = true]
-         |  |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Ball"]
+         |  |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Ball"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "b", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PRIVATE, @Final = false, @Image = "stopProcessing", @Name = "stopProcessing", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PRIVATE, @Void = true]
@@ -338,9 +338,9 @@
          |  +- FormalParameters[@Empty = false, @Size = 1]
          |  |  +- FormalParameter[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @Varargs = false, @Visibility = Visibility.V_LOCAL]
          |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+         |  |     +- ClassType[@FullyQualified = false, @SimpleName = "List"]
          |  |     |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |  |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Order"]
+         |  |     |     +- ClassType[@FullyQualified = false, @SimpleName = "Order"]
          |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = true, @LambdaParameter = false, @LocalVariable = false, @Name = "orders", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |  +- Block[@Empty = false, @Size = 7, @containsComment = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
@@ -352,7 +352,7 @@
          |     +- ForeachStatement[]
          |     |  +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Order"]
+         |     |  |  +- ClassType[@FullyQualified = false, @SimpleName = "Order"]
          |     |  |  +- VariableDeclarator[@Initializer = false, @Name = "_"]
          |     |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = true, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "orders", @Name = "orders", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -369,7 +369,7 @@
          |     |  +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |     |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |     |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |     |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |     +- ArgumentList[@Empty = false, @Size = 1]
          |     |        +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "total: ", @Empty = false, @Image = "\"total: \"", @Length = 7, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -398,18 +398,18 @@
          |     |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-         |     |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+         |     |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
          |     |           +- ArgumentList[@Empty = false, @Size = 1]
          |     |              +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
          |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Queue"]
+         |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Queue"]
          |     |  |  +- TypeArguments[@Diamond = false, @Empty = false, @Size = 1]
-         |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+         |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
          |     |  +- VariableDeclarator[@Initializer = true, @Name = "q"]
          |     |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "q", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |     +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = true, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ArrayDeque"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "ArrayDeque"]
          |     |        |  +- TypeArguments[@Diamond = true, @Empty = true, @Size = 0]
          |     |        +- ArgumentList[@Empty = true, @Size = 0]
          |     +- WhileStatement[]
@@ -445,11 +445,11 @@
          |     |     |        +- ArgumentList[@Empty = true, @Size = 0]
          |     |     +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |        +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |     |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |     |        +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |     |        +- VariableDeclarator[@Initializer = true, @Name = "p"]
          |     |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |     |           +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |     |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |     |              +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |     |              +- ArgumentList[@Empty = false, @Size = 2]
          |     |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x", @Name = "x", @ParenthesisDepth = 0, @Parenthesized = false]
          |     |                 +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "y", @Name = "y", @ParenthesisDepth = 0, @Parenthesized = false]
@@ -483,34 +483,34 @@
          |           |        +- ArgumentList[@Empty = true, @Size = 0]
          |           +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |              +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-         |              +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |              +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |              +- VariableDeclarator[@Initializer = true, @Name = "p"]
          |                 +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "p", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
          |                 +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |                    +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Point"]
+         |                    +- ClassType[@FullyQualified = false, @SimpleName = "Point"]
          |                    +- ArgumentList[@Empty = false, @Size = 2]
          |                       +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "x", @Name = "x", @ParenthesisDepth = 0, @Parenthesized = false]
          |                       +- NumericLiteral[@Base = 10, @CompileTimeConstant = true, @DoubleLiteral = false, @FloatLiteral = false, @Image = "0", @IntLiteral = true, @Integral = true, @LongLiteral = false, @ParenthesisDepth = 0, @Parenthesized = false, @ValueAsDouble = 0.0, @ValueAsFloat = 0.0, @ValueAsInt = 0, @ValueAsLong = 0]
          +- ClassOrInterfaceDeclaration[@Abstract = false, @Annotation = false, @Anonymous = false, @BinaryName = "Jep443_UnamedPatternsAndVariables$ScopedContext", @CanonicalName = "Jep443_UnamedPatternsAndVariables.ScopedContext", @EffectiveVisibility = Visibility.V_PACKAGE, @Enum = false, @Final = false, @Interface = false, @Local = false, @Nested = true, @PackageName = "", @Record = false, @RegularClass = true, @RegularInterface = false, @SimpleName = "ScopedContext", @Static = true, @TopLevel = false, @Visibility = Visibility.V_PACKAGE]
          |  +- ModifierList[@EffectiveModifiers = "{static}", @ExplicitModifiers = "{static}"]
          |  +- ImplementsList[@Empty = false, @Size = 1]
-         |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "AutoCloseable"]
+         |  |  +- ClassType[@FullyQualified = false, @SimpleName = "AutoCloseable"]
          |  +- ClassOrInterfaceBody[@Empty = false, @Size = 2]
          |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "close", @Name = "close", @Overridden = true, @Static = false, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = true]
          |     |  +- ModifierList[@EffectiveModifiers = "{public}", @ExplicitModifiers = "{public}"]
          |     |  |  +- Annotation[@SimpleName = "Override"]
-         |     |  |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Override"]
+         |     |  |     +- ClassType[@FullyQualified = false, @SimpleName = "Override"]
          |     |  +- VoidType[]
          |     |  +- FormalParameters[@Empty = true, @Size = 0]
          |     |  +- Block[@Empty = true, @Size = 0, @containsComment = false]
          |     +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "acquire", @Name = "acquire", @Overridden = false, @Static = true, @Varargs = false, @Visibility = Visibility.V_PUBLIC, @Void = false]
          |        +- ModifierList[@EffectiveModifiers = "{public, static}", @ExplicitModifiers = "{public, static}"]
-         |        +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ScopedContext"]
+         |        +- ClassType[@FullyQualified = false, @SimpleName = "ScopedContext"]
          |        +- FormalParameters[@Empty = true, @Size = 0]
          |        +- Block[@Empty = false, @Size = 1, @containsComment = false]
          |           +- ReturnStatement[]
          |              +- ConstructorCall[@AnonymousClass = false, @CompileTimeConstant = false, @DiamondTypeArgs = false, @MethodName = "new", @ParenthesisDepth = 0, @Parenthesized = false, @QualifiedInstanceCreation = false]
-         |                 +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ScopedContext"]
+         |                 +- ClassType[@FullyQualified = false, @SimpleName = "ScopedContext"]
          |                 +- ArgumentList[@Empty = true, @Size = 0]
          +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "unusedVariables2", @Name = "unusedVariables2", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = true]
             +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -526,12 +526,12 @@
                |  |           +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = true, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "_", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = true, @Visibility = Visibility.V_LOCAL]
                |  |           +- MethodCall[@CompileTimeConstant = false, @Image = "acquire", @MethodName = "acquire", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |              +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |              |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "ScopedContext"]
+               |  |              |  +- ClassType[@FullyQualified = false, @SimpleName = "ScopedContext"]
                |  |              +- ArgumentList[@Empty = true, @Size = 0]
                |  +- Block[@Empty = true, @Size = 0, @containsComment = true]
                +- LocalVariableDeclaration[@EffectiveVisibility = Visibility.V_LOCAL, @Final = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+               |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                |  +- VariableDeclarator[@Initializer = true, @Name = "s"]
                |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "s", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "123", @Empty = false, @Image = "\"123\"", @Length = 3, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -544,27 +544,27 @@
                |  |  |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_LOCAL, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = true, @Name = "i", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_LOCAL]
                |  |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "parseInt", @MethodName = "parseInt", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |  |        +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |  |        |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Integer"]
+               |  |  |        |  +- ClassType[@FullyQualified = false, @SimpleName = "Integer"]
                |  |  |        +- ArgumentList[@Empty = false, @Size = 1]
                |  |  |           +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "s", @Name = "s", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |  +- ExpressionStatement[]
                |  |     +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |        +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |        |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |        |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |  |        |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |  |        +- ArgumentList[@Empty = false, @Size = 1]
                |  |           +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "i", @Name = "i", @ParenthesisDepth = 0, @Parenthesized = false]
                |  +- CatchClause[]
                |  |  +- CatchParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Multicatch = false, @Name = "_", @Visibility = Visibility.V_PACKAGE]
                |  |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "NumberFormatException"]
+               |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "NumberFormatException"]
                |  |  |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = true, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
                |  |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
                |  |     +- ExpressionStatement[]
                |  |        +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |           +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  |           |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |  |           |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |  |           |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |  |           +- ArgumentList[@Empty = false, @Size = 1]
                |  |              +- InfixExpression[@CompileTimeConstant = false, @Operator = BinaryOp.ADD, @ParenthesisDepth = 0, @Parenthesized = false]
                |  |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Bad number: ", @Empty = false, @Image = "\"Bad number: \"", @Length = 12, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -572,14 +572,14 @@
                |  +- CatchClause[]
                |     +- CatchParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Multicatch = false, @Name = "_", @Visibility = Visibility.V_PACKAGE]
                |     |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-               |     |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Exception"]
+               |     |  +- ClassType[@FullyQualified = false, @SimpleName = "Exception"]
                |     |  +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = true, @Field = false, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "_", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
                |     +- Block[@Empty = false, @Size = 1, @containsComment = false]
                |        +- ExpressionStatement[]
                |           +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                |              +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |              |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |              |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                |              +- ArgumentList[@Empty = false, @Size = 1]
                |                 +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "error...", @Empty = false, @Image = "\"error...\"", @Length = 8, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                +- ExpressionStatement[]
@@ -587,7 +587,7 @@
                      +- MethodCall[@CompileTimeConstant = false, @Image = "stream", @MethodName = "stream", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  +- MethodCall[@CompileTimeConstant = false, @Image = "of", @MethodName = "of", @ParenthesisDepth = 0, @Parenthesized = false]
                      |  |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                     |  |  |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "List"]
+                     |  |  |  +- ClassType[@FullyQualified = false, @SimpleName = "List"]
                      |  |  +- ArgumentList[@Empty = false, @Size = 2]
                      |  |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "a", @Empty = false, @Image = "\"a\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
                      |  |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "b", @Empty = false, @Image = "\"b\"", @Length = 1, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -595,11 +595,11 @@
                      +- ArgumentList[@Empty = false, @Size = 1]
                         +- MethodCall[@CompileTimeConstant = false, @Image = "toMap", @MethodName = "toMap", @ParenthesisDepth = 0, @Parenthesized = false]
                            +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                           |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Collectors"]
+                           |  +- ClassType[@FullyQualified = false, @SimpleName = "Collectors"]
                            +- ArgumentList[@Empty = false, @Size = 2]
                               +- MethodReference[@CompileTimeConstant = false, @ConstructorReference = false, @MethodName = "toUpperCase", @ParenthesisDepth = 0, @Parenthesized = false]
                               |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-                              |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+                              |     +- ClassType[@FullyQualified = false, @SimpleName = "String"]
                               +- LambdaExpression[@Arity = 1, @BlockBody = false, @CompileTimeConstant = false, @ExpressionBody = true, @ParenthesisDepth = 0, @Parenthesized = false]
                                  +- LambdaParameterList[@Empty = false, @Size = 1]
                                  |  +- LambdaParameter[@EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @TypeInferred = true, @Visibility = Visibility.V_PACKAGE]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses1.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses1.txt
index 50ae244956..ec527219c6 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses1.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses1.txt
@@ -8,6 +8,6 @@
             +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                +- ArgumentList[@Empty = false, @Size = 1]
                   +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Hello World", @Empty = false, @Image = "\"Hello World\"", @Length = 11, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses2.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses2.txt
index 09b56f2902..67a0903f38 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses2.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses2.txt
@@ -1,7 +1,7 @@
 +- CompilationUnit[@PackageName = ""]
    +- MethodDeclaration[@Abstract = false, @Arity = 0, @EffectiveVisibility = Visibility.V_PACKAGE, @Final = false, @Image = "greeting", @Name = "greeting", @Overridden = false, @Static = false, @Varargs = false, @Visibility = Visibility.V_PACKAGE, @Void = false]
    |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |  +- FormalParameters[@Empty = true, @Size = 0]
    |  +- Block[@Empty = false, @Size = 1, @containsComment = false]
    |     +- ReturnStatement[]
@@ -15,7 +15,7 @@
             +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                +- ArgumentList[@Empty = false, @Size = 1]
                   +- MethodCall[@CompileTimeConstant = false, @Image = "greeting", @MethodName = "greeting", @ParenthesisDepth = 0, @Parenthesized = false]
                      +- ArgumentList[@Empty = true, @Size = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses3.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses3.txt
index 49cba46339..1dd7198c4f 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses3.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java21p/Jep445_UnnamedClasses3.txt
@@ -1,7 +1,7 @@
 +- CompilationUnit[@PackageName = ""]
    +- FieldDeclaration[@EffectiveVisibility = Visibility.V_PACKAGE, @Static = false, @Visibility = Visibility.V_PACKAGE]
    |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
-   |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "String"]
+   |  +- ClassType[@FullyQualified = false, @SimpleName = "String"]
    |  +- VariableDeclarator[@Initializer = true, @Name = "greeting"]
    |     +- VariableDeclaratorId[@ArrayType = false, @EffectiveVisibility = Visibility.V_PACKAGE, @EnumConstant = false, @ExceptionBlockParameter = false, @Field = true, @Final = false, @ForLoopVariable = false, @ForeachVariable = false, @FormalParameter = false, @LambdaParameter = false, @LocalVariable = false, @Name = "greeting", @PatternBinding = false, @RecordComponent = false, @ResourceDeclaration = false, @TypeInferred = false, @Visibility = Visibility.V_PACKAGE]
    |     +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "Hello, World!", @Empty = false, @Image = "\"Hello, World!\"", @Length = 13, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
@@ -14,6 +14,6 @@
             +- MethodCall[@CompileTimeConstant = false, @Image = "println", @MethodName = "println", @ParenthesisDepth = 0, @Parenthesized = false]
                +- FieldAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "out", @Name = "out", @ParenthesisDepth = 0, @Parenthesized = false]
                |  +- TypeExpression[@CompileTimeConstant = false, @ParenthesisDepth = 0, @Parenthesized = false]
-               |     +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "System"]
+               |     +- ClassType[@FullyQualified = false, @SimpleName = "System"]
                +- ArgumentList[@Empty = false, @Size = 1]
                   +- VariableAccess[@AccessType = AccessType.READ, @CompileTimeConstant = false, @Image = "greeting", @Name = "greeting", @ParenthesisDepth = 0, @Parenthesized = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt
index c89fddc3c2..ba4b32715b 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt
@@ -11,11 +11,11 @@
       +- ModuleExportsDirective[@PackageName = "com.example.foo.internal"]
       |  +- ModuleName[@Name = "com.example.foo.probe"]
       +- ModuleUsesDirective[]
-      |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Intf"]
+      |  +- ClassType[@FullyQualified = true, @SimpleName = "Intf"]
       +- ModuleProvidesDirective[]
-      |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Intf"]
-      |  +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Impl"]
+      |  +- ClassType[@FullyQualified = true, @SimpleName = "Intf"]
+      |  +- ClassType[@FullyQualified = true, @SimpleName = "Impl"]
       +- ModuleProvidesDirective[]
-         +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Intf2"]
-         +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Impl"]
-         +- ClassOrInterfaceType[@FullyQualified = true, @SimpleName = "Impl2"]
+         +- ClassType[@FullyQualified = true, @SimpleName = "Intf2"]
+         +- ClassType[@FullyQualified = true, @SimpleName = "Impl"]
+         +- ClassType[@FullyQualified = true, @SimpleName = "Impl2"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.txt
index 1df5299614..aff1ced66c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.txt
@@ -1,7 +1,7 @@
 +- CompilationUnit[@PackageName = ""]
    +- ModuleDeclaration[@Name = "jdk.pack", @Open = false]
       +- Annotation[@SimpleName = "Deprecated"]
-      |  +- ClassOrInterfaceType[@FullyQualified = false, @SimpleName = "Deprecated"]
+      |  +- ClassType[@FullyQualified = false, @SimpleName = "Deprecated"]
       |  +- AnnotationMemberList[@Empty = false, @Size = 2]
       |     +- MemberValuePair[@Image = "since", @Name = "since", @Shorthand = false]
       |     |  +- StringLiteral[@CompileTimeConstant = true, @ConstValue = "11", @Empty = false, @Image = "\"11\"", @Length = 2, @ParenthesisDepth = 0, @Parenthesized = false, @TextBlock = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/types/IteratorUtilCopy.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/types/IteratorUtilCopy.txt
index 1059bd7a39..c572c0a9e3 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/types/IteratorUtilCopy.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/types/IteratorUtilCopy.txt
@@ -45,40 +45,40 @@
          +- AnnotationTypeDeclaration[@TypeMirror = "IteratorUtilCopy$Nullable"]
          |  +- ModifierList[]
          |  |  +- Annotation[@TypeMirror = "java.lang.annotation.Target"]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.annotation.Target"]
+         |  |     +- ClassType[@TypeMirror = "java.lang.annotation.Target"]
          |  |     +- AnnotationMemberList[]
          |  |        +- MemberValuePair[]
          |  |           +- FieldAccess[@Name = "TYPE_USE", @TypeMirror = "java.lang.annotation.ElementType"]
          |  |              +- TypeExpression[@TypeMirror = "java.lang.annotation.ElementType"]
-         |  |                 +- ClassOrInterfaceType[@TypeMirror = "java.lang.annotation.ElementType"]
+         |  |                 +- ClassType[@TypeMirror = "java.lang.annotation.ElementType"]
          |  +- AnnotationTypeBody[]
          +- MethodDeclaration[@Name = "takeWhile"]
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
-         |  |  |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |     +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iter", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Predicate"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Predicate"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Predicate"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "predicate", @TypeMirror = "java.util.function.Predicate"]
          |  +- Block[]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "IteratorUtilCopy$AbstractIterator.new() -> IteratorUtilCopy$AbstractIterator", @MethodName = "new", @TypeMirror = "IteratorUtilCopy$AbstractIterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
+         |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |           |     +- ClassType[@TypeMirror = "T"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$1"]
          |              +- ModifierList[]
@@ -86,13 +86,13 @@
          |                 +- MethodDeclaration[@Name = "computeNext"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                    +- VoidType[@TypeMirror = "void"]
          |                    +- FormalParameters[]
          |                    +- Block[]
          |                       +- LocalVariableDeclaration[]
          |                       |  +- ModifierList[]
-         |                       |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |                       |  +- ClassType[@TypeMirror = "T"]
          |                       |  +- VariableDeclarator[]
          |                       |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "T"]
          |                       |     +- MethodCall[@Failed = false, @Function = "java.util.Iterator.next() -> T", @MethodName = "next", @TypeMirror = "T", @Unchecked = false, @VarargsCall = false]
@@ -116,22 +116,22 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
-         |  |     |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |     +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "it", @TypeMirror = "java.util.Iterator"]
          |  +- Block[]
          |     +- LocalVariableDeclaration[]
          |     |  +- ModifierList[]
-         |     |  +- ClassOrInterfaceType[@TypeMirror = "java.util.List"]
+         |     |  +- ClassType[@TypeMirror = "java.util.List"]
          |     |  |  +- TypeArguments[]
-         |     |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |  |     +- ClassType[@TypeMirror = "T"]
          |     |  +- VariableDeclarator[]
          |     |     +- VariableDeclaratorId[@Name = "tmp", @TypeMirror = "java.util.List"]
          |     |     +- MethodCall[@Failed = false, @Function = "IteratorUtilCopy. toList(java.util.Iterator) -> java.util.List", @MethodName = "toList", @TypeMirror = "java.util.List", @Unchecked = false, @VarargsCall = false]
@@ -140,7 +140,7 @@
          |     +- ExpressionStatement[]
          |     |  +- MethodCall[@Failed = false, @Function = "java.util.Collections.reverse(java.util.List) -> void", @MethodName = "reverse", @TypeMirror = "void", @Unchecked = false, @VarargsCall = false]
          |     |     +- TypeExpression[@TypeMirror = "java.util.Collections"]
-         |     |     |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Collections"]
+         |     |     |  +- ClassType[@TypeMirror = "java.util.Collections"]
          |     |     +- ArgumentList[]
          |     |        +- VariableAccess[@Name = "tmp", @TypeMirror = "java.util.List"]
          |     +- ReturnStatement[]
@@ -152,54 +152,54 @@
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
          |  |  +- TypeParameter[@TypeMirror = "R"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     +- ClassType[@TypeMirror = "R"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iter", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Function>"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Function>"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Function>"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |     |  +- ClassType[@TypeMirror = "T"]
          |  |     |     +- WildcardType[@TypeMirror = "? extends @Nullable java.util.Iterator"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "@Nullable java.util.Iterator"]
+         |  |     |        +- ClassType[@TypeMirror = "@Nullable java.util.Iterator"]
          |  |     |           +- Annotation[@TypeMirror = "IteratorUtilCopy$Nullable"]
-         |  |     |           |  +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$Nullable"]
+         |  |     |           |  +- ClassType[@TypeMirror = "IteratorUtilCopy$Nullable"]
          |  |     |           +- TypeArguments[]
          |  |     |              +- WildcardType[@TypeMirror = "? extends R"]
-         |  |     |                 +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     |                 +- ClassType[@TypeMirror = "R"]
          |  |     +- VariableDeclaratorId[@Name = "f", @TypeMirror = "java.util.function.Function>"]
          |  +- Block[]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "IteratorUtilCopy$AbstractIterator.new() -> IteratorUtilCopy$AbstractIterator", @MethodName = "new", @TypeMirror = "IteratorUtilCopy$AbstractIterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
+         |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |           |     +- ClassType[@TypeMirror = "R"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$2"]
          |              +- ModifierList[]
          |              +- ClassOrInterfaceBody[]
          |                 +- FieldDeclaration[]
          |                 |  +- ModifierList[]
-         |                 |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |                 |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |                 |  |  +- TypeArguments[]
          |                 |  |     +- WildcardType[@TypeMirror = "? extends R"]
-         |                 |  |        +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |                 |  |        +- ClassType[@TypeMirror = "R"]
          |                 |  +- VariableDeclarator[]
          |                 |     +- VariableDeclaratorId[@Name = "current", @TypeMirror = "java.util.Iterator"]
          |                 |     +- NullLiteral[@TypeMirror = "null"]
          |                 +- MethodDeclaration[@Name = "computeNext"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                    +- VoidType[@TypeMirror = "void"]
          |                    +- FormalParameters[]
          |                    +- Block[]
@@ -226,10 +226,10 @@
          |                             |  +- Block[]
          |                             |     +- LocalVariableDeclaration[]
          |                             |     |  +- ModifierList[]
-         |                             |     |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |                             |     |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |                             |     |  |  +- TypeArguments[]
          |                             |     |  |     +- WildcardType[@TypeMirror = "? extends R"]
-         |                             |     |  |        +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |                             |     |  |        +- ClassType[@TypeMirror = "R"]
          |                             |     |  +- VariableDeclarator[]
          |                             |     |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "java.util.Iterator"]
          |                             |     |     +- MethodCall[@Failed = false, @Function = "java.util.function.Function>.apply(capture#... of ? super T) -> capture#... of ? extends @Nullable java.util.Iterator", @MethodName = "apply", @TypeMirror = "capture#... of ? extends @Nullable java.util.Iterator", @Unchecked = false, @VarargsCall = false]
@@ -265,52 +265,52 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "R"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     +- ClassType[@TypeMirror = "R"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends R"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |  |  |        +- ClassType[@TypeMirror = "R"]
          |  |  |  +- VariableDeclaratorId[@Name = "iter", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Function>"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Function>"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Function>"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super R"]
-         |  |     |     |  +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     |     |  +- ClassType[@TypeMirror = "R"]
          |  |     |     +- WildcardType[@TypeMirror = "? extends java.util.Iterator"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     |        +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |           +- TypeArguments[]
          |  |     |              +- WildcardType[@TypeMirror = "? extends R"]
-         |  |     |                 +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     |                 +- ClassType[@TypeMirror = "R"]
          |  |     +- VariableDeclaratorId[@Name = "f", @TypeMirror = "java.util.function.Function>"]
          |  +- Block[]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "IteratorUtilCopy$AbstractIterator.new() -> IteratorUtilCopy$AbstractIterator", @MethodName = "new", @TypeMirror = "IteratorUtilCopy$AbstractIterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
+         |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |           |     +- ClassType[@TypeMirror = "R"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$3"]
          |              +- ModifierList[]
          |              +- ClassOrInterfaceBody[]
          |                 +- FieldDeclaration[]
          |                 |  +- ModifierList[]
-         |                 |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |                 |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |                 |  |  +- TypeArguments[]
          |                 |  |     +- WildcardType[@TypeMirror = "? extends R"]
-         |                 |  |        +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |                 |  |        +- ClassType[@TypeMirror = "R"]
          |                 |  +- VariableDeclarator[]
          |                 |     +- VariableDeclaratorId[@Name = "current", @TypeMirror = "java.util.Iterator"]
          |                 |     +- NullLiteral[@TypeMirror = "null"]
          |                 +- MethodDeclaration[@Name = "computeNext"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                    +- VoidType[@TypeMirror = "void"]
          |                    +- FormalParameters[]
          |                    +- Block[]
@@ -341,7 +341,7 @@
          |                                +- Block[]
          |                                |  +- LocalVariableDeclaration[]
          |                                |  |  +- ModifierList[]
-         |                                |  |  +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |                                |  |  +- ClassType[@TypeMirror = "R"]
          |                                |  |  +- VariableDeclarator[]
          |                                |  |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "R"]
          |                                |  |     +- MethodCall[@Failed = false, @Function = "java.util.Iterator.next() -> capture#... of ? extends R", @MethodName = "next", @TypeMirror = "capture#... of ? extends R", @Unchecked = false, @VarargsCall = false]
@@ -366,16 +366,16 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "it", @TypeMirror = "java.util.Iterator"]
          |  +- Block[]
          |     +- ReturnStatement[]
@@ -384,38 +384,38 @@
          |              +- VariableAccess[@Name = "it", @TypeMirror = "java.util.Iterator"]
          |              +- MethodReference[@TypeMirror = "java.util.function.Predicate"]
          |                 +- TypeExpression[@TypeMirror = "java.util.Objects"]
-         |                    +- ClassOrInterfaceType[@TypeMirror = "java.util.Objects"]
+         |                    +- ClassType[@TypeMirror = "java.util.Objects"]
          +- MethodDeclaration[@Name = "mapNotNull"]
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
          |  |  +- TypeParameter[@TypeMirror = "R"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     +- ClassType[@TypeMirror = "R"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "it", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Function"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Function"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Function"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |     |  +- ClassType[@TypeMirror = "T"]
          |  |     |     +- WildcardType[@TypeMirror = "? extends R"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     |        +- ClassType[@TypeMirror = "R"]
          |  |     +- VariableDeclaratorId[@Name = "mapper", @TypeMirror = "java.util.function.Function"]
          |  +- Block[]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "IteratorUtilCopy$AbstractIterator.new() -> IteratorUtilCopy$AbstractIterator", @MethodName = "new", @TypeMirror = "IteratorUtilCopy$AbstractIterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
+         |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |           |     +- ClassType[@TypeMirror = "R"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$4"]
          |              +- ModifierList[]
@@ -423,7 +423,7 @@
          |                 +- MethodDeclaration[@Name = "computeNext"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                    +- VoidType[@TypeMirror = "void"]
          |                    +- FormalParameters[]
          |                    +- Block[]
@@ -434,7 +434,7 @@
          |                       |  +- Block[]
          |                       |     +- LocalVariableDeclaration[]
          |                       |     |  +- ModifierList[]
-         |                       |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |                       |     |  +- ClassType[@TypeMirror = "T"]
          |                       |     |  +- VariableDeclarator[]
          |                       |     |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "T"]
          |                       |     |     +- MethodCall[@Failed = false, @Function = "java.util.Iterator.next() -> capture#... of ? extends T", @MethodName = "next", @TypeMirror = "capture#... of ? extends T", @Unchecked = false, @VarargsCall = false]
@@ -447,7 +447,7 @@
          |                       |        +- Block[]
          |                       |           +- LocalVariableDeclaration[]
          |                       |           |  +- ModifierList[]
-         |                       |           |  +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |                       |           |  +- ClassType[@TypeMirror = "R"]
          |                       |           |  +- VariableDeclarator[]
          |                       |           |     +- VariableDeclaratorId[@Name = "map", @TypeMirror = "R"]
          |                       |           |     +- MethodCall[@Failed = false, @Function = "java.util.function.Function.apply(capture#... of ? super T) -> capture#... of ? extends R", @MethodName = "apply", @TypeMirror = "capture#... of ? extends R", @Unchecked = false, @VarargsCall = false]
@@ -471,30 +471,30 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "it", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Predicate"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Predicate"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Predicate"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "filter", @TypeMirror = "java.util.function.Predicate"]
          |  +- Block[]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "IteratorUtilCopy$AbstractIterator.new() -> IteratorUtilCopy$AbstractIterator", @MethodName = "new", @TypeMirror = "IteratorUtilCopy$AbstractIterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
+         |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |           |     +- ClassType[@TypeMirror = "T"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$5"]
          |              +- ModifierList[]
@@ -502,7 +502,7 @@
          |                 +- MethodDeclaration[@Name = "computeNext"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                    +- VoidType[@TypeMirror = "void"]
          |                    +- FormalParameters[]
          |                    +- Block[]
@@ -513,7 +513,7 @@
          |                       |  +- Block[]
          |                       |     +- LocalVariableDeclaration[]
          |                       |     |  +- ModifierList[]
-         |                       |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |                       |     |  +- ClassType[@TypeMirror = "T"]
          |                       |     |  +- VariableDeclarator[]
          |                       |     |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "T"]
          |                       |     |     +- MethodCall[@Failed = false, @Function = "java.util.Iterator.next() -> capture#... of ? extends T", @MethodName = "next", @TypeMirror = "capture#... of ? extends T", @Unchecked = false, @VarargsCall = false]
@@ -537,23 +537,23 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iter", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Consumer"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Consumer"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Consumer"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "action", @TypeMirror = "java.util.function.Consumer"]
          |  +- Block[]
          |     +- ReturnStatement[]
@@ -578,32 +578,32 @@
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
          |  |  +- TypeParameter[@TypeMirror = "R"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     +- ClassType[@TypeMirror = "R"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iter", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Function"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Function"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Function"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |     |  +- ClassType[@TypeMirror = "T"]
          |  |     |     +- WildcardType[@TypeMirror = "? extends R"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     |        +- ClassType[@TypeMirror = "R"]
          |  |     +- VariableDeclaratorId[@Name = "mapper", @TypeMirror = "java.util.function.Function"]
          |  +- Block[]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "java.lang.Object.new() -> java.util.Iterator", @MethodName = "new", @TypeMirror = "java.util.Iterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |           +- ClassType[@TypeMirror = "java.util.Iterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |           |     +- ClassType[@TypeMirror = "R"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$6"]
          |              +- ModifierList[]
@@ -611,7 +611,7 @@
          |                 +- MethodDeclaration[@Name = "hasNext"]
          |                 |  +- ModifierList[]
          |                 |  |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                 |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                 |  |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                 |  +- PrimitiveType[@TypeMirror = "boolean"]
          |                 |  +- FormalParameters[]
          |                 |  +- Block[]
@@ -622,8 +622,8 @@
          |                 +- MethodDeclaration[@Name = "next"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
-         |                    +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
+         |                    +- ClassType[@TypeMirror = "R"]
          |                    +- FormalParameters[]
          |                    +- Block[]
          |                       +- ReturnStatement[]
@@ -638,30 +638,30 @@
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
          |  |  +- TypeParameter[@TypeMirror = "R"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.lang.Iterable"]
+         |  +- ClassType[@TypeMirror = "java.lang.Iterable"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     +- ClassType[@TypeMirror = "R"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.lang.Iterable"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.lang.Iterable"]
+         |  |  |  +- ClassType[@TypeMirror = "java.lang.Iterable"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iter", @TypeMirror = "java.lang.Iterable"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Function, ? extends java.util.Iterator>"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Function, ? extends java.util.Iterator>"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Function, ? extends java.util.Iterator>"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super java.util.Iterator"]
-         |  |     |     |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     |     |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |     |     +- TypeArguments[]
          |  |     |     |        +- WildcardType[@TypeMirror = "? extends T"]
-         |  |     |     |           +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |     |           +- ClassType[@TypeMirror = "T"]
          |  |     |     +- WildcardType[@TypeMirror = "? extends java.util.Iterator"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     |        +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |           +- TypeArguments[]
-         |  |     |              +- ClassOrInterfaceType[@TypeMirror = "R"]
+         |  |     |              +- ClassType[@TypeMirror = "R"]
          |  |     +- VariableDeclaratorId[@Name = "mapper", @TypeMirror = "java.util.function.Function, ? extends java.util.Iterator>"]
          |  +- Block[]
          |     +- ReturnStatement[]
@@ -676,17 +676,17 @@
          +- MethodDeclaration[@Name = "iterate"]
          |  +- ModifierList[]
          |  |  +- Annotation[@TypeMirror = "java.lang.SafeVarargs"]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.SafeVarargs"]
+         |  |     +- ClassType[@TypeMirror = "java.lang.SafeVarargs"]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "T[]"]
          |  |     +- ModifierList[]
          |  |     +- ArrayType[@TypeMirror = "T[]"]
-         |  |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |  +- ClassType[@TypeMirror = "T"]
          |  |     |  +- ArrayDimensions[]
          |  |     |     +- ArrayTypeDim[]
          |  |     +- VariableDeclaratorId[@Name = "elements", @TypeMirror = "T[]"]
@@ -695,7 +695,7 @@
          |        +- MethodCall[@Failed = false, @Function = "java.util.List.iterator() -> java.util.Iterator", @MethodName = "iterator", @TypeMirror = "java.util.Iterator", @Unchecked = false, @VarargsCall = false]
          |           +- MethodCall[@Failed = false, @Function = "java.util.Arrays. asList(T...) -> java.util.List", @MethodName = "asList", @TypeMirror = "java.util.List", @Unchecked = false, @VarargsCall = false]
          |           |  +- TypeExpression[@TypeMirror = "java.util.Arrays"]
-         |           |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Arrays"]
+         |           |  |  +- ClassType[@TypeMirror = "java.util.Arrays"]
          |           |  +- ArgumentList[]
          |           |     +- VariableAccess[@Name = "elements", @TypeMirror = "T[]"]
          |           +- ArgumentList[]
@@ -703,23 +703,23 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "as", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "bs", @TypeMirror = "java.util.Iterator"]
          |  +- Block[]
          |     +- IfStatement[]
@@ -730,9 +730,9 @@
          |     |  +- Block[]
          |     |  |  +- ReturnStatement[]
          |     |  |     +- CastExpression[@TypeMirror = "java.util.Iterator"]
-         |     |  |        +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |     |  |        +- ClassType[@TypeMirror = "java.util.Iterator"]
          |     |  |        |  +- TypeArguments[]
-         |     |  |        |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |  |        |     +- ClassType[@TypeMirror = "T"]
          |     |  |        +- VariableAccess[@Name = "bs", @TypeMirror = "java.util.Iterator"]
          |     |  +- IfStatement[]
          |     |     +- UnaryExpression[@TypeMirror = "boolean"]
@@ -742,15 +742,15 @@
          |     |     +- Block[]
          |     |        +- ReturnStatement[]
          |     |           +- CastExpression[@TypeMirror = "java.util.Iterator"]
-         |     |              +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |     |              +- ClassType[@TypeMirror = "java.util.Iterator"]
          |     |              |  +- TypeArguments[]
-         |     |              |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |              |     +- ClassType[@TypeMirror = "T"]
          |     |              +- VariableAccess[@Name = "as", @TypeMirror = "java.util.Iterator"]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "java.lang.Object.new() -> java.util.Iterator", @MethodName = "new", @TypeMirror = "java.util.Iterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |           +- ClassType[@TypeMirror = "java.util.Iterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |           |     +- ClassType[@TypeMirror = "T"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$7"]
          |              +- ModifierList[]
@@ -758,7 +758,7 @@
          |                 +- MethodDeclaration[@Name = "hasNext"]
          |                 |  +- ModifierList[]
          |                 |  |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                 |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                 |  |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                 |  +- PrimitiveType[@TypeMirror = "boolean"]
          |                 |  +- FormalParameters[]
          |                 |  +- Block[]
@@ -773,8 +773,8 @@
          |                 +- MethodDeclaration[@Name = "next"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
-         |                    +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
+         |                    +- ClassType[@TypeMirror = "T"]
          |                    +- FormalParameters[]
          |                    +- Block[]
          |                       +- ReturnStatement[]
@@ -792,27 +792,27 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "iter", @TypeMirror = "java.util.Iterator"]
          |  +- Block[]
          |     +- LocalVariableDeclaration[]
          |     |  +- ModifierList[]
-         |     |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Set"]
+         |     |  +- ClassType[@TypeMirror = "java.util.Set"]
          |     |  |  +- TypeArguments[]
-         |     |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |  |     +- ClassType[@TypeMirror = "T"]
          |     |  +- VariableDeclarator[]
          |     |     +- VariableDeclaratorId[@Name = "seen", @TypeMirror = "java.util.Set"]
          |     |     +- ConstructorCall[@Failed = false, @Function = "java.util.HashSet.new() -> java.util.HashSet", @MethodName = "new", @TypeMirror = "java.util.HashSet", @Unchecked = false, @VarargsCall = false]
-         |     |        +- ClassOrInterfaceType[@TypeMirror = "java.util.HashSet"]
+         |     |        +- ClassType[@TypeMirror = "java.util.HashSet"]
          |     |        |  +- TypeArguments[]
          |     |        +- ArgumentList[]
          |     +- ReturnStatement[]
@@ -825,27 +825,27 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.List"]
+         |  +- ClassType[@TypeMirror = "java.util.List"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "it", @TypeMirror = "java.util.Iterator"]
          |  +- Block[]
          |     +- LocalVariableDeclaration[]
          |     |  +- ModifierList[]
-         |     |  +- ClassOrInterfaceType[@TypeMirror = "java.util.List"]
+         |     |  +- ClassType[@TypeMirror = "java.util.List"]
          |     |  |  +- TypeArguments[]
-         |     |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |  |     +- ClassType[@TypeMirror = "T"]
          |     |  +- VariableDeclarator[]
          |     |     +- VariableDeclaratorId[@Name = "list", @TypeMirror = "java.util.List"]
          |     |     +- ConstructorCall[@Failed = false, @Function = "java.util.ArrayList.new() -> java.util.ArrayList", @MethodName = "new", @TypeMirror = "java.util.ArrayList", @Unchecked = false, @VarargsCall = false]
-         |     |        +- ClassOrInterfaceType[@TypeMirror = "java.util.ArrayList"]
+         |     |        +- ClassType[@TypeMirror = "java.util.ArrayList"]
          |     |        |  +- TypeArguments[]
          |     |        +- ArgumentList[]
          |     +- WhileStatement[]
@@ -866,27 +866,27 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.List"]
+         |  +- ClassType[@TypeMirror = "java.util.List"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "it", @TypeMirror = "java.util.Iterator"]
          |  +- Block[]
          |     +- LocalVariableDeclaration[]
          |     |  +- ModifierList[]
-         |     |  +- ClassOrInterfaceType[@TypeMirror = "java.util.List"]
+         |     |  +- ClassType[@TypeMirror = "java.util.List"]
          |     |  |  +- TypeArguments[]
-         |     |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |  |     +- ClassType[@TypeMirror = "T"]
          |     |  +- VariableDeclarator[]
          |     |     +- VariableDeclaratorId[@Name = "list", @TypeMirror = "java.util.List"]
          |     |     +- ConstructorCall[@Failed = false, @Function = "java.util.ArrayList.new() -> java.util.ArrayList", @MethodName = "new", @TypeMirror = "java.util.ArrayList", @Unchecked = false, @VarargsCall = false]
-         |     |        +- ClassOrInterfaceType[@TypeMirror = "java.util.ArrayList"]
+         |     |        +- ClassType[@TypeMirror = "java.util.ArrayList"]
          |     |        |  +- TypeArguments[]
          |     |        +- ArgumentList[]
          |     +- WhileStatement[]
@@ -896,7 +896,7 @@
          |     |  +- Block[]
          |     |     +- LocalVariableDeclaration[]
          |     |     |  +- ModifierList[]
-         |     |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |     |  +- ClassType[@TypeMirror = "T"]
          |     |     |  +- VariableDeclarator[]
          |     |     |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "T"]
          |     |     |     +- MethodCall[@Failed = false, @Function = "java.util.Iterator.next() -> capture#... of ? extends T", @MethodName = "next", @TypeMirror = "capture#... of ? extends T", @Unchecked = false, @VarargsCall = false]
@@ -918,15 +918,15 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.lang.Iterable"]
+         |  +- ClassType[@TypeMirror = "java.lang.Iterable"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
-         |  |     |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |     +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "it", @TypeMirror = "java.util.Iterator"]
          |  +- Block[]
          |     +- ReturnStatement[]
@@ -939,7 +939,7 @@
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "?"]
          |  |     +- VariableDeclaratorId[@Name = "it", @TypeMirror = "java.util.Iterator"]
@@ -968,19 +968,19 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "iterator", @TypeMirror = "java.util.Iterator"]
          |  +- Block[]
          |     +- LocalVariableDeclaration[]
          |     |  +- ModifierList[]
-         |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |  +- ClassType[@TypeMirror = "T"]
          |     |  +- VariableDeclarator[]
          |     |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "T"]
          |     |     +- NullLiteral[@TypeMirror = "null"]
@@ -1001,14 +1001,14 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iterator", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "int"]
          |  |     +- ModifierList[]
@@ -1035,7 +1035,7 @@
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "?"]
          |  |  |  +- VariableDeclaratorId[@Name = "iterator", @TypeMirror = "java.util.Iterator"]
@@ -1064,16 +1064,16 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iterator", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "int"]
          |  |     +- ModifierList[]
@@ -1088,13 +1088,13 @@
          |     |     +- ReturnStatement[]
          |     |        +- MethodCall[@Failed = false, @Function = "java.util.Collections. emptyIterator() -> java.util.Iterator", @MethodName = "emptyIterator", @TypeMirror = "java.util.Iterator", @Unchecked = false, @VarargsCall = false]
          |     |           +- TypeExpression[@TypeMirror = "java.util.Collections"]
-         |     |           |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Collections"]
+         |     |           |  +- ClassType[@TypeMirror = "java.util.Collections"]
          |     |           +- ArgumentList[]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "IteratorUtilCopy$AbstractIterator.new() -> IteratorUtilCopy$AbstractIterator", @MethodName = "new", @TypeMirror = "IteratorUtilCopy$AbstractIterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
+         |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |           |     +- ClassType[@TypeMirror = "T"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$8"]
          |              +- ModifierList[]
@@ -1108,7 +1108,7 @@
          |                 +- MethodDeclaration[@Name = "computeNext"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                    +- VoidType[@TypeMirror = "void"]
          |                    +- FormalParameters[]
          |                    +- Block[]
@@ -1139,16 +1139,16 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "source", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "int"]
          |  |     +- ModifierList[]
@@ -1162,15 +1162,15 @@
          |     |  +- Block[]
          |     |     +- ReturnStatement[]
          |     |        +- CastExpression[@TypeMirror = "java.util.Iterator"]
-         |     |           +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |     |           +- ClassType[@TypeMirror = "java.util.Iterator"]
          |     |           |  +- TypeArguments[]
-         |     |           |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |           |     +- ClassType[@TypeMirror = "T"]
          |     |           +- VariableAccess[@Name = "source", @TypeMirror = "java.util.Iterator"]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "IteratorUtilCopy$AbstractIterator.new() -> IteratorUtilCopy$AbstractIterator", @MethodName = "new", @TypeMirror = "IteratorUtilCopy$AbstractIterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
+         |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |           |     +- ClassType[@TypeMirror = "T"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$9"]
          |              +- ModifierList[]
@@ -1184,7 +1184,7 @@
          |                 +- MethodDeclaration[@Name = "computeNext"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                    +- VoidType[@TypeMirror = "void"]
          |                    +- FormalParameters[]
          |                    +- Block[]
@@ -1222,43 +1222,43 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "T"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "seed", @TypeMirror = "T"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Function"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Function"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Function"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |     |  +- ClassType[@TypeMirror = "T"]
          |  |     |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "stepper", @TypeMirror = "java.util.function.Function"]
          |  +- Block[]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "IteratorUtilCopy$AbstractIterator.new() -> IteratorUtilCopy$AbstractIterator", @MethodName = "new", @TypeMirror = "IteratorUtilCopy$AbstractIterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
+         |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
          |           |  +- TypeArguments[]
-         |           |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |           |     +- ClassType[@TypeMirror = "T"]
          |           +- ArgumentList[]
          |           +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$10"]
          |              +- ModifierList[]
          |              +- ClassOrInterfaceBody[]
          |                 +- FieldDeclaration[]
          |                 |  +- ModifierList[]
-         |                 |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |                 |  +- ClassType[@TypeMirror = "T"]
          |                 |  +- VariableDeclarator[]
          |                 |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "T"]
          |                 |     +- VariableAccess[@Name = "seed", @TypeMirror = "T"]
          |                 +- MethodDeclaration[@Name = "computeNext"]
          |                    +- ModifierList[]
          |                    |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                    |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                    +- VoidType[@TypeMirror = "void"]
          |                    +- FormalParameters[]
          |                    +- Block[]
@@ -1290,17 +1290,17 @@
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iterator", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Predicate"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Predicate"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Predicate"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "pred", @TypeMirror = "java.util.function.Predicate"]
          |  +- Block[]
          |     +- ReturnStatement[]
@@ -1317,17 +1317,17 @@
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iterator", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Predicate"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Predicate"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Predicate"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "pred", @TypeMirror = "java.util.function.Predicate"]
          |  +- Block[]
          |     +- ReturnStatement[]
@@ -1344,17 +1344,17 @@
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iterator", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Predicate"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Predicate"]
+         |  |     +- ClassType[@TypeMirror = "java.util.function.Predicate"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "pred", @TypeMirror = "java.util.function.Predicate"]
          |  +- Block[]
          |     +- ReturnStatement[]
@@ -1371,17 +1371,17 @@
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "iterator", @TypeMirror = "java.util.Iterator"]
          |  |  +- FormalParameter[@TypeMirror = "java.util.function.Predicate"]
          |  |  |  +- ModifierList[]
-         |  |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Predicate"]
+         |  |  |  +- ClassType[@TypeMirror = "java.util.function.Predicate"]
          |  |  |  |  +- TypeArguments[]
          |  |  |  |     +- WildcardType[@TypeMirror = "? super T"]
-         |  |  |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |  |  |        +- ClassType[@TypeMirror = "T"]
          |  |  |  +- VariableDeclaratorId[@Name = "pred", @TypeMirror = "java.util.function.Predicate"]
          |  |  +- FormalParameter[@TypeMirror = "int"]
          |  |     +- ModifierList[]
@@ -1411,7 +1411,7 @@
          |     |  +- Block[]
          |     |     +- LocalVariableDeclaration[]
          |     |     |  +- ModifierList[]
-         |     |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |     |  +- ClassType[@TypeMirror = "T"]
          |     |     |  +- VariableDeclarator[]
          |     |     |     +- VariableDeclaratorId[@Name = "value", @TypeMirror = "T"]
          |     |     |     +- MethodCall[@Failed = false, @Function = "java.util.Iterator.next() -> capture#... of ? extends T", @MethodName = "next", @TypeMirror = "capture#... of ? extends T", @Unchecked = false, @VarargsCall = false]
@@ -1442,22 +1442,22 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "T"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "value", @TypeMirror = "T"]
          |  +- Block[]
          |     +- LocalClassStatement[]
          |     |  +- ClassOrInterfaceDeclaration[@TypeMirror = "IteratorUtilCopy#SingletonIterator"]
          |     |     +- ModifierList[]
          |     |     +- ImplementsList[]
-         |     |     |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |     |     |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |     |     |     +- TypeArguments[]
-         |     |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |     |        +- ClassType[@TypeMirror = "T"]
          |     |     +- ClassOrInterfaceBody[]
          |     |        +- FieldDeclaration[]
          |     |        |  +- ModifierList[]
@@ -1467,7 +1467,7 @@
          |     |        +- MethodDeclaration[@Name = "hasNext"]
          |     |        |  +- ModifierList[]
          |     |        |  |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |     |        |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |     |        |  |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |     |        |  +- PrimitiveType[@TypeMirror = "boolean"]
          |     |        |  +- FormalParameters[]
          |     |        |  +- Block[]
@@ -1477,8 +1477,8 @@
          |     |        +- MethodDeclaration[@Name = "next"]
          |     |        |  +- ModifierList[]
          |     |        |  |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |     |        |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
-         |     |        |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |        |  |     +- ClassType[@TypeMirror = "java.lang.Override"]
+         |     |        |  +- ClassType[@TypeMirror = "T"]
          |     |        |  +- FormalParameters[]
          |     |        |  +- Block[]
          |     |        |     +- IfStatement[]
@@ -1486,7 +1486,7 @@
          |     |        |     |  +- Block[]
          |     |        |     |     +- ThrowStatement[]
          |     |        |     |        +- ConstructorCall[@Failed = false, @Function = "java.util.NoSuchElementException.new() -> java.util.NoSuchElementException", @MethodName = "new", @TypeMirror = "java.util.NoSuchElementException", @Unchecked = false, @VarargsCall = false]
-         |     |        |     |           +- ClassOrInterfaceType[@TypeMirror = "java.util.NoSuchElementException"]
+         |     |        |     |           +- ClassType[@TypeMirror = "java.util.NoSuchElementException"]
          |     |        |     |           +- ArgumentList[]
          |     |        |     +- ExpressionStatement[]
          |     |        |     |  +- AssignmentExpression[@TypeMirror = "boolean"]
@@ -1497,15 +1497,15 @@
          |     |        +- MethodDeclaration[@Name = "forEachRemaining"]
          |     |           +- ModifierList[]
          |     |           |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |     |           |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |     |           |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |     |           +- VoidType[@TypeMirror = "void"]
          |     |           +- FormalParameters[]
          |     |           |  +- FormalParameter[@TypeMirror = "java.util.function.Consumer"]
          |     |           |     +- ModifierList[]
-         |     |           |     +- ClassOrInterfaceType[@TypeMirror = "java.util.function.Consumer"]
+         |     |           |     +- ClassType[@TypeMirror = "java.util.function.Consumer"]
          |     |           |     |  +- TypeArguments[]
          |     |           |     |     +- WildcardType[@TypeMirror = "? super T"]
-         |     |           |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |           |     |        +- ClassType[@TypeMirror = "T"]
          |     |           |     +- VariableDeclaratorId[@Name = "action", @TypeMirror = "java.util.function.Consumer"]
          |     |           +- Block[]
          |     |              +- ExpressionStatement[]
@@ -1515,39 +1515,39 @@
          |     |                       +- VariableAccess[@Name = "value", @TypeMirror = "T"]
          |     +- ReturnStatement[]
          |        +- ConstructorCall[@Failed = false, @Function = "IteratorUtilCopy#SingletonIterator.new() -> IteratorUtilCopy#SingletonIterator", @MethodName = "new", @TypeMirror = "IteratorUtilCopy#SingletonIterator", @Unchecked = false, @VarargsCall = false]
-         |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy#SingletonIterator"]
+         |           +- ClassType[@TypeMirror = "IteratorUtilCopy#SingletonIterator"]
          |           +- ArgumentList[]
          +- MethodDeclaration[@Name = "asReversed"]
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.lang.Iterable"]
+         |  +- ClassType[@TypeMirror = "java.lang.Iterable"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.List"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.List"]
+         |  |     +- ClassType[@TypeMirror = "java.util.List"]
          |  |     |  +- TypeArguments[]
-         |  |     |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |     +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "lst", @TypeMirror = "java.util.List"]
          |  +- Block[]
          |     +- ReturnStatement[]
          |        +- LambdaExpression[@TypeMirror = "java.lang.Iterable"]
          |           +- LambdaParameterList[]
          |           +- ConstructorCall[@Failed = false, @Function = "java.lang.Object.new() -> java.util.Iterator", @MethodName = "new", @TypeMirror = "java.util.Iterator", @Unchecked = false, @VarargsCall = false]
-         |              +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |              +- ClassType[@TypeMirror = "java.util.Iterator"]
          |              |  +- TypeArguments[]
-         |              |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |              |     +- ClassType[@TypeMirror = "T"]
          |              +- ArgumentList[]
          |              +- AnonymousClassDeclaration[@TypeMirror = "IteratorUtilCopy$11"]
          |                 +- ModifierList[]
          |                 +- ClassOrInterfaceBody[]
          |                    +- FieldDeclaration[]
          |                    |  +- ModifierList[]
-         |                    |  +- ClassOrInterfaceType[@TypeMirror = "java.util.ListIterator"]
+         |                    |  +- ClassType[@TypeMirror = "java.util.ListIterator"]
          |                    |  |  +- TypeArguments[]
-         |                    |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |                    |  |     +- ClassType[@TypeMirror = "T"]
          |                    |  +- VariableDeclarator[]
          |                    |     +- VariableDeclaratorId[@Name = "li", @TypeMirror = "java.util.ListIterator"]
          |                    |     +- MethodCall[@Failed = false, @Function = "java.util.List.listIterator(int) -> java.util.ListIterator", @MethodName = "listIterator", @TypeMirror = "java.util.ListIterator", @Unchecked = false, @VarargsCall = false]
@@ -1559,7 +1559,7 @@
          |                    +- MethodDeclaration[@Name = "hasNext"]
          |                    |  +- ModifierList[]
          |                    |  |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                    |  |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                    |  +- PrimitiveType[@TypeMirror = "boolean"]
          |                    |  +- FormalParameters[]
          |                    |  +- Block[]
@@ -1570,8 +1570,8 @@
          |                    +- MethodDeclaration[@Name = "next"]
          |                    |  +- ModifierList[]
          |                    |  |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                    |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
-         |                    |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |                    |  |     +- ClassType[@TypeMirror = "java.lang.Override"]
+         |                    |  +- ClassType[@TypeMirror = "T"]
          |                    |  +- FormalParameters[]
          |                    |  +- Block[]
          |                    |     +- ReturnStatement[]
@@ -1581,7 +1581,7 @@
          |                    +- MethodDeclaration[@Name = "remove"]
          |                       +- ModifierList[]
          |                       |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |                       |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |                       |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |                       +- VoidType[@TypeMirror = "void"]
          |                       +- FormalParameters[]
          |                       +- Block[]
@@ -1593,26 +1593,26 @@
          |  +- ModifierList[]
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
-         |  +- ClassOrInterfaceType[@TypeMirror = "java.util.stream.Stream"]
+         |  +- ClassType[@TypeMirror = "java.util.stream.Stream"]
          |  |  +- TypeArguments[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     +- ClassType[@TypeMirror = "T"]
          |  +- FormalParameters[]
          |  |  +- FormalParameter[@TypeMirror = "java.util.Iterator"]
          |  |     +- ModifierList[]
-         |  |     +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |     +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     |  +- TypeArguments[]
          |  |     |     +- WildcardType[@TypeMirror = "? extends T"]
-         |  |     |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |     |        +- ClassType[@TypeMirror = "T"]
          |  |     +- VariableDeclaratorId[@Name = "iter", @TypeMirror = "java.util.Iterator"]
          |  +- Block[]
          |     +- ReturnStatement[]
          |        +- MethodCall[@Failed = false, @Function = "java.util.stream.StreamSupport. stream(java.util.Spliterator, boolean) -> java.util.stream.Stream", @MethodName = "stream", @TypeMirror = "java.util.stream.Stream", @Unchecked = false, @VarargsCall = false]
          |           +- TypeExpression[@TypeMirror = "java.util.stream.StreamSupport"]
-         |           |  +- ClassOrInterfaceType[@TypeMirror = "java.util.stream.StreamSupport"]
+         |           |  +- ClassType[@TypeMirror = "java.util.stream.StreamSupport"]
          |           +- ArgumentList[]
          |              +- MethodCall[@Failed = false, @Function = "java.util.Spliterators. spliteratorUnknownSize(java.util.Iterator, int) -> java.util.Spliterator", @MethodName = "spliteratorUnknownSize", @TypeMirror = "java.util.Spliterator", @Unchecked = false, @VarargsCall = false]
          |              |  +- TypeExpression[@TypeMirror = "java.util.Spliterators"]
-         |              |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Spliterators"]
+         |              |  |  +- ClassType[@TypeMirror = "java.util.Spliterators"]
          |              |  +- ArgumentList[]
          |              |     +- VariableAccess[@Name = "iter", @TypeMirror = "java.util.Iterator"]
          |              |     +- NumericLiteral[@TypeMirror = "int"]
@@ -1622,28 +1622,28 @@
          |  +- TypeParameters[]
          |  |  +- TypeParameter[@TypeMirror = "T"]
          |  +- ImplementsList[]
-         |  |  +- ClassOrInterfaceType[@TypeMirror = "java.util.Iterator"]
+         |  |  +- ClassType[@TypeMirror = "java.util.Iterator"]
          |  |     +- TypeArguments[]
-         |  |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |  |        +- ClassType[@TypeMirror = "T"]
          |  +- ClassOrInterfaceBody[]
          |     +- FieldDeclaration[]
          |     |  +- ModifierList[]
-         |     |  +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
+         |     |  +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |  +- VariableDeclarator[]
          |     |     +- VariableDeclaratorId[@Name = "state", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |     +- FieldAccess[@Name = "NOT_READY", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |        +- TypeExpression[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
-         |     |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
+         |     |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     +- FieldDeclaration[]
          |     |  +- ModifierList[]
-         |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |  +- ClassType[@TypeMirror = "T"]
          |     |  +- VariableDeclarator[]
          |     |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "T"]
          |     |     +- NullLiteral[@TypeMirror = "null"]
          |     +- MethodDeclaration[@Name = "hasNext"]
          |     |  +- ModifierList[]
          |     |  |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |     |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |     |  |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |     |  +- PrimitiveType[@TypeMirror = "boolean"]
          |     |  +- FormalParameters[]
          |     |  +- Block[]
@@ -1675,7 +1675,7 @@
          |     |           |  +- Block[]
          |     |           |     +- ThrowStatement[]
          |     |           |        +- ConstructorCall[@Failed = false, @Function = "java.lang.IllegalStateException.new(java.lang.String) -> java.lang.IllegalStateException", @MethodName = "new", @TypeMirror = "java.lang.IllegalStateException", @Unchecked = false, @VarargsCall = false]
-         |     |           |           +- ClassOrInterfaceType[@TypeMirror = "java.lang.IllegalStateException"]
+         |     |           |           +- ClassType[@TypeMirror = "java.lang.IllegalStateException"]
          |     |           |           +- ArgumentList[]
          |     |           |              +- StringLiteral[@TypeMirror = "java.lang.String"]
          |     |           +- ReturnStatement[]
@@ -1683,12 +1683,12 @@
          |     |                 +- VariableAccess[@Name = "state", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |                 +- FieldAccess[@Name = "READY", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |                    +- TypeExpression[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
-         |     |                       +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
+         |     |                       +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     +- MethodDeclaration[@Name = "next"]
          |     |  +- ModifierList[]
          |     |  |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |     |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
-         |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |  |     +- ClassType[@TypeMirror = "java.lang.Override"]
+         |     |  +- ClassType[@TypeMirror = "T"]
          |     |  +- FormalParameters[]
          |     |  +- Block[]
          |     |     +- IfStatement[]
@@ -1698,14 +1698,14 @@
          |     |     |  +- Block[]
          |     |     |     +- ThrowStatement[]
          |     |     |        +- ConstructorCall[@Failed = false, @Function = "java.util.NoSuchElementException.new() -> java.util.NoSuchElementException", @MethodName = "new", @TypeMirror = "java.util.NoSuchElementException", @Unchecked = false, @VarargsCall = false]
-         |     |     |           +- ClassOrInterfaceType[@TypeMirror = "java.util.NoSuchElementException"]
+         |     |     |           +- ClassType[@TypeMirror = "java.util.NoSuchElementException"]
          |     |     |           +- ArgumentList[]
          |     |     +- ExpressionStatement[]
          |     |     |  +- AssignmentExpression[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |     |     +- VariableAccess[@Name = "state", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |     |     +- FieldAccess[@Name = "NOT_READY", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |     |        +- TypeExpression[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
-         |     |     |           +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
+         |     |     |           +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |     +- ReturnStatement[]
          |     |        +- VariableAccess[@Name = "next", @TypeMirror = "T"]
          |     +- MethodDeclaration[@Name = "setNext"]
@@ -1714,7 +1714,7 @@
          |     |  +- FormalParameters[]
          |     |  |  +- FormalParameter[@TypeMirror = "T"]
          |     |  |     +- ModifierList[]
-         |     |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+         |     |  |     +- ClassType[@TypeMirror = "T"]
          |     |  |     +- VariableDeclaratorId[@Name = "t", @TypeMirror = "T"]
          |     |  +- Block[]
          |     |     +- ExpressionStatement[]
@@ -1726,7 +1726,7 @@
          |     |           +- VariableAccess[@Name = "state", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |           +- FieldAccess[@Name = "READY", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |              +- TypeExpression[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
-         |     |                 +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
+         |     |                 +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     +- MethodDeclaration[@Name = "done"]
          |     |  +- ModifierList[]
          |     |  +- VoidType[@TypeMirror = "void"]
@@ -1737,7 +1737,7 @@
          |     |           +- VariableAccess[@Name = "state", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |           +- FieldAccess[@Name = "DONE", @TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     |              +- TypeExpression[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
-         |     |                 +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
+         |     |                 +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator$State"]
          |     +- MethodDeclaration[@Name = "computeNext"]
          |     |  +- ModifierList[]
          |     |  +- VoidType[@TypeMirror = "void"]
@@ -1757,24 +1757,24 @@
          |     +- MethodDeclaration[@Name = "remove"]
          |        +- ModifierList[]
          |        |  +- Annotation[@TypeMirror = "java.lang.Deprecated"]
-         |        |  |  +- ClassOrInterfaceType[@TypeMirror = "java.lang.Deprecated"]
+         |        |  |  +- ClassType[@TypeMirror = "java.lang.Deprecated"]
          |        |  +- Annotation[@TypeMirror = "java.lang.Override"]
-         |        |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
+         |        |     +- ClassType[@TypeMirror = "java.lang.Override"]
          |        +- VoidType[@TypeMirror = "void"]
          |        +- FormalParameters[]
          |        +- Block[]
          |           +- ThrowStatement[]
          |              +- ConstructorCall[@Failed = false, @Function = "java.lang.UnsupportedOperationException.new() -> java.lang.UnsupportedOperationException", @MethodName = "new", @TypeMirror = "java.lang.UnsupportedOperationException", @Unchecked = false, @VarargsCall = false]
-         |                 +- ClassOrInterfaceType[@TypeMirror = "java.lang.UnsupportedOperationException"]
+         |                 +- ClassType[@TypeMirror = "java.lang.UnsupportedOperationException"]
          |                 +- ArgumentList[]
          +- ClassOrInterfaceDeclaration[@TypeMirror = "IteratorUtilCopy$AbstractPausingIterator"]
             +- ModifierList[]
             +- TypeParameters[]
             |  +- TypeParameter[@TypeMirror = "T"]
             +- ExtendsList[]
-            |  +- ClassOrInterfaceType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
+            |  +- ClassType[@TypeMirror = "IteratorUtilCopy$AbstractIterator"]
             |     +- TypeArguments[]
-            |        +- ClassOrInterfaceType[@TypeMirror = "T"]
+            |        +- ClassType[@TypeMirror = "T"]
             +- ClassOrInterfaceBody[]
                +- FieldDeclaration[]
                |  +- ModifierList[]
@@ -1784,19 +1784,19 @@
                |     +- NumericLiteral[@TypeMirror = "int"]
                +- FieldDeclaration[]
                |  +- ModifierList[]
-               |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+               |  +- ClassType[@TypeMirror = "T"]
                |  +- VariableDeclarator[]
                |     +- VariableDeclaratorId[@Name = "currentValue", @TypeMirror = "T"]
                +- MethodDeclaration[@Name = "next"]
                |  +- ModifierList[]
                |  |  +- Annotation[@TypeMirror = "java.lang.Override"]
-               |  |     +- ClassOrInterfaceType[@TypeMirror = "java.lang.Override"]
-               |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+               |  |     +- ClassType[@TypeMirror = "java.lang.Override"]
+               |  +- ClassType[@TypeMirror = "T"]
                |  +- FormalParameters[]
                |  +- Block[]
                |     +- LocalVariableDeclaration[]
                |     |  +- ModifierList[]
-               |     |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+               |     |  +- ClassType[@TypeMirror = "T"]
                |     |  +- VariableDeclarator[]
                |     |     +- VariableDeclaratorId[@Name = "next", @TypeMirror = "T"]
                |     |     +- MethodCall[@Failed = false, @Function = "IteratorUtilCopy$AbstractIterator.next() -> T", @MethodName = "next", @TypeMirror = "T", @Unchecked = false, @VarargsCall = false]
@@ -1821,7 +1821,7 @@
                |  +- FormalParameters[]
                |  |  +- FormalParameter[@TypeMirror = "T"]
                |  |     +- ModifierList[]
-               |  |     +- ClassOrInterfaceType[@TypeMirror = "T"]
+               |  |     +- ClassType[@TypeMirror = "T"]
                |  |     +- VariableDeclaratorId[@Name = "current", @TypeMirror = "T"]
                |  +- Block[]
                +- MethodDeclaration[@Name = "getIterationCount"]
@@ -1833,7 +1833,7 @@
                |        +- VariableAccess[@Name = "numYielded", @TypeMirror = "int"]
                +- MethodDeclaration[@Name = "getCurrentValue"]
                |  +- ModifierList[]
-               |  +- ClassOrInterfaceType[@TypeMirror = "T"]
+               |  +- ClassType[@TypeMirror = "T"]
                |  +- FormalParameters[]
                |  +- Block[]
                |     +- ExpressionStatement[]
@@ -1853,6 +1853,6 @@
                         +- Block[]
                            +- ThrowStatement[]
                               +- ConstructorCall[@Failed = false, @Function = "java.lang.IllegalStateException.new(java.lang.String) -> java.lang.IllegalStateException", @MethodName = "new", @TypeMirror = "java.lang.IllegalStateException", @Unchecked = false, @VarargsCall = false]
-                                 +- ClassOrInterfaceType[@TypeMirror = "java.lang.IllegalStateException"]
+                                 +- ClassType[@TypeMirror = "java.lang.IllegalStateException"]
                                  +- ArgumentList[]
                                     +- StringLiteral[@TypeMirror = "java.lang.String"]