diff --git a/config/archunit-store/slices_should_be_free_of_cycles_suppressions b/config/archunit-store/slices_should_be_free_of_cycles_suppressions
index 08e79e572b6..8abe5682cab 100644
--- a/config/archunit-store/slices_should_be_free_of_cycles_suppressions
+++ b/config/archunit-store/slices_should_be_free_of_cycles_suppressions
@@ -311,14 +311,13 @@ Cycle detected: Slice api -> \
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PACKAGE> in (ScopeUtil.java:121)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElseIf(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (CheckUtil.java:122)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElseIf(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:124)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isCheckstyleTreeWalkerCheck(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (ModuleReflectionUtil.java:126)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:134)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElse(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:135)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:136)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileSetModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck> in (ModuleReflectionUtil.java:137)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:137)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (ScopeUtil.java:140)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:142)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isCheckstyleTreeWalkerCheck(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (ModuleReflectionUtil.java:145)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.ANONINNER> in (ScopeUtil.java:145)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (XpathUtil.java:145)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElseWithCurlyBraces(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:146)\
@@ -327,13 +326,12 @@ Cycle detected: Slice api -> \
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.createFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AnnotationUtil.java:148)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (AnnotationUtil.java:148)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElseWithCurlyBraces(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (CheckUtil.java:148)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.Filter> in (ModuleReflectionUtil.java:148)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AnnotationUtil.java:151)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileSetModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck> in (ModuleReflectionUtil.java:156)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.supportsTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathUtil.java:157)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.BeforeExecutionFileFilter> in (ModuleReflectionUtil.java:159)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.Filter> in (ModuleReflectionUtil.java:167)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getTextAttributeValue(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (XpathUtil.java:167)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getTextAttributeValue(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathUtil.java:168)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isAuditListener(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AuditListener> in (ModuleReflectionUtil.java:170)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:171)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:172)\
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getBlockCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocUtil.java:173)\
@@ -341,14 +339,16 @@ Cycle detected: Slice api -> \
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getBlockCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocUtil.java:174)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:175)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:175)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isRootModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.RootModule> in (ModuleReflectionUtil.java:181)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.BeforeExecutionFileFilter> in (ModuleReflectionUtil.java:178)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AnnotationUtil.java:185)\
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocUtil.java:185)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AnnotationUtil.java:186)\
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocUtil.java:186)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:187)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isAuditListener(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AuditListener> in (ModuleReflectionUtil.java:189)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:190)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.printXpathBranch(java.lang.String, java.io.File)> calls constructor <com.puppycrawl.tools.checkstyle.api.CheckstyleException.<init>(java.lang.String, java.lang.Throwable)> in (XpathUtil.java:198)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isRootModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.RootModule> in (ModuleReflectionUtil.java:200)\
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.findFirstToken(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocUtil.java:202)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:205)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:207)\
@@ -1330,7 +1330,6 @@ Cycle detected: Slice api -> \
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:88)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPackage(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (BlockCommentPosition.java:89)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPackage(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:92)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isValidCheckstyleClass(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AutomaticBean> in (ModuleReflectionUtil.java:94)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.containsAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:95)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:95)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:96)\
@@ -1347,6 +1346,7 @@ Cycle detected: Slice api -> \
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PUBLIC> in (ScopeUtil.java:108)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:110)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PRIVATE> in (ScopeUtil.java:111)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isValidCheckstyleClass(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AutomaticBean> in (ModuleReflectionUtil.java:113)\
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.api.LineColumn.getColumn()> in (JavadocUtil.java:114)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PACKAGE> in (ScopeUtil.java:114)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PUBLIC> in (ScopeUtil.java:118)\
@@ -1355,14 +1355,13 @@ Cycle detected: Slice api -> \
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PACKAGE> in (ScopeUtil.java:121)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElseIf(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (CheckUtil.java:122)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElseIf(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:124)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isCheckstyleTreeWalkerCheck(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (ModuleReflectionUtil.java:126)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:134)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElse(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:135)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:136)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileSetModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck> in (ModuleReflectionUtil.java:137)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:137)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (ScopeUtil.java:140)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:142)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isCheckstyleTreeWalkerCheck(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (ModuleReflectionUtil.java:145)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.ANONINNER> in (ScopeUtil.java:145)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (XpathUtil.java:145)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElseWithCurlyBraces(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:146)\
@@ -1371,13 +1370,12 @@ Cycle detected: Slice api -> \
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.createFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AnnotationUtil.java:148)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (AnnotationUtil.java:148)\
     - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isElseWithCurlyBraces(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (CheckUtil.java:148)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.Filter> in (ModuleReflectionUtil.java:148)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AnnotationUtil.java:151)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileSetModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck> in (ModuleReflectionUtil.java:156)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.supportsTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathUtil.java:157)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.BeforeExecutionFileFilter> in (ModuleReflectionUtil.java:159)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.Filter> in (ModuleReflectionUtil.java:167)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getTextAttributeValue(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (XpathUtil.java:167)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getTextAttributeValue(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathUtil.java:168)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isAuditListener(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AuditListener> in (ModuleReflectionUtil.java:170)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:171)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:172)\
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getBlockCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocUtil.java:173)\
@@ -1385,14 +1383,16 @@ Cycle detected: Slice api -> \
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getBlockCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocUtil.java:174)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:175)\
     - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:175)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isRootModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.RootModule> in (ModuleReflectionUtil.java:181)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.BeforeExecutionFileFilter> in (ModuleReflectionUtil.java:178)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AnnotationUtil.java:185)\
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocUtil.java:185)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AnnotationUtil.java:186)\
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocUtil.java:186)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:187)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isAuditListener(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AuditListener> in (ModuleReflectionUtil.java:189)\
     - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:190)\
     - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.printXpathBranch(java.lang.String, java.io.File)> calls constructor <com.puppycrawl.tools.checkstyle.api.CheckstyleException.<init>(java.lang.String, java.lang.Throwable)> in (XpathUtil.java:198)\
+    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isRootModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.RootModule> in (ModuleReflectionUtil.java:200)\
     - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.findFirstToken(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocUtil.java:202)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:205)\
     - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:207)\
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
index bec9669bf3f..5da711a217b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
@@ -303,7 +303,7 @@ Definitions.CHECKSTYLE_BUNDLE, getClass(),
     private Map<String, Set<String>> generateThirdPartyNameToFullModuleName(ClassLoader loader) {
         Map<String, Set<String>> returnValue;
         try {
-            returnValue = ModuleReflectionUtil.getCheckstyleModules(packages, loader).stream()
+            returnValue = ModuleReflectionUtil.getValidCheckstyleClasses(packages, loader).stream()
                 .collect(Collectors.groupingBy(Class::getSimpleName,
                     Collectors.mapping(Class::getCanonicalName, Collectors.toSet())));
         }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java
index c9d4713a1b7..882ee49589d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java
@@ -46,21 +46,21 @@ private ModuleReflectionUtil() {
     }
 
     /**
-     * Gets checkstyle's modules (directly, not recursively) in the given packages.
+     * Gets valid checkstyle's classes (directly, not recursively) in the given packages.
      *
      * @param packages the collection of package names to use
      * @param loader the class loader used to load Checkstyle package names
-     * @return the set of checkstyle's module classes
+     * @return the set of checkstyle's classes
      * @throws IOException if the attempt to read class path resources failed
      * @see #isCheckstyleModule(Class)
      */
-    public static Set<Class<?>> getCheckstyleModules(
+    public static Set<Class<?>> getValidCheckstyleClasses(
             Collection<String> packages, ClassLoader loader) throws IOException {
         final ClassPath classPath = ClassPath.from(loader);
         return packages.stream()
                 .flatMap(pkg -> classPath.getTopLevelClasses(pkg).stream())
                 .map(ClassPath.ClassInfo::load)
-                .filter(ModuleReflectionUtil::isCheckstyleModule)
+                .filter(ModuleReflectionUtil::isValidCheckstyleClass)
                 .collect(Collectors.toSet());
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java
index 8bfe18c23e5..bcc365e8b89 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java
@@ -457,8 +457,9 @@ public void testGenerateThirdPartyNameToFullModuleNameWithException() throws Exc
 
         try (MockedStatic<ModuleReflectionUtil> utilities =
                      mockStatic(ModuleReflectionUtil.class)) {
-            utilities.when(() -> ModuleReflectionUtil.getCheckstyleModules(packages, classLoader))
-                    .thenThrow(new IOException("mock exception"));
+            utilities.when(() -> {
+                ModuleReflectionUtil.getValidCheckstyleClasses(packages, classLoader);
+            }).thenThrow(new IOException("mock exception"));
 
             final String internalFieldName = "thirdPartyNameToFullModuleNames";
             final Map<String, String> nullMap = TestUtil.getInternalState(objectFactory,