diff --git a/checkstyle.xml b/checkstyle.xml
index 3ae86a87f2276219715fb33432085ff4b56fae1a..6314d6616c6d2ee4a33ba0e12d3ce56255a5eee1 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -31,7 +31,7 @@
         <module name="IllegalImport"/>
         <module name="Indentation">
             <property name="basicOffset" value="4"/>
-            <property name="caseIndent" value="4"/>
+            <property name="caseIndent"  value="4"/>
         </module>
         <module name="JavadocMethod">
             <property name="allowUndeclaredRTE" value="true"/>
@@ -71,20 +71,19 @@
                              PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
                              SR_ASSIGN, STAR, STAR_ASSIGN"/>
         </module>
-        <module name="FileContentsHolder"/>
         <module name="SuppressionCommentFilter">
            <property name="offCommentFormat" value="CHECKSTYLE\: stop JavadocVariable check"/>
             <property name="onCommentFormat"  value="CHECKSTYLE\: resume JavadocVariable check"/>
             <property name="checkFormat"      value="JavadocVariable"/>
         </module>
         <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="CHECKSTYLE\: stop VisibilityModifierCheck"/>
-            <property name="onCommentFormat"  value="CHECKSTYLE\: resume VisibilityModifierCheck"/>
+            <property name="offCommentFormat" value="CHECKSTYLE\: stop VisibilityModifier check"/>
+            <property name="onCommentFormat"  value="CHECKSTYLE\: resume VisibilityModifier check"/>
             <property name="checkFormat"      value="VisibilityModifierCheck"/>
         </module>
         <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="CHECKSTYLE\: stop NoWhitespaceAfter"/>
-            <property name="onCommentFormat"  value="CHECKSTYLE\: resume NoWhitespaceAfter"/>
+            <property name="offCommentFormat" value="CHECKSTYLE\: stop NoWhitespaceAfter check"/>
+            <property name="onCommentFormat"  value="CHECKSTYLE\: resume NoWhitespaceAfter check"/>
             <property name="checkFormat"      value="NoWhitespaceAfter"/>
         </module>
         <module name="SuppressionCommentFilter">