diff --git a/pom.xml b/pom.xml
index b0839690..479608a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <connection>scm:git:ssh//git@github.com/${developerId}/${project.artifactId}.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/${developerId}/${project.artifactId}.git</developerConnection>
         <url>https://github.com/${developerId}/${project.artifactId}/tree/master</url>
-  </scm>
+    </scm>
 
     <issueManagement>
         <system>Github</system>
diff --git a/src/test/resources/team/checkstyle-rules.xml b/src/test/resources/team/checkstyle-rules.xml
index eb977721..7d64d497 100644
--- a/src/test/resources/team/checkstyle-rules.xml
+++ b/src/test/resources/team/checkstyle-rules.xml
@@ -42,9 +42,9 @@
     <module name="TreeWalker">
         <module name="ArrayTypeStyle"/>
         <module name="AvoidNestedBlocks"/>
-        <!--module name="CatchParameterName">
-            <property name="format" value="(^_ex[a-zA-Z0-9]*$)|(^_[a-z][a-zA-Z0-9]*Exception$)"/>
-        </module-->
+        <module name="CatchParameterName">
+            <property name="format" value="^_(ex[a-zA-Z0-9]*)|([a-z][a-zA-Z0-9]*Exception|ignored)$"/>
+        </module>
         <module name="ConstantName"/>
         <!--module name="DeclarationOrder" /-->
         <module name="EmptyBlock"/>
@@ -81,7 +81,9 @@
         <module name="LocalVariableName">
             <property name="format" value="(^[a-z][a-zA-Z0-9]*$)|(^[ijk]$)"/>
         </module>
-        <module name="MemberName"/>
+        <module name="MemberName">
+            <property name="format" value="^[a-z][a-zA-Z0-9]*$" />
+        </module>
         <module name="MethodLength">
             <property name="max" value="400"/>
             <property name="countEmpty" value="false"/>
diff --git a/src/test/resources/team/pmd-rules.xml b/src/test/resources/team/pmd-rules.xml
index c6440796..0ab12f34 100644
--- a/src/test/resources/team/pmd-rules.xml
+++ b/src/test/resources/team/pmd-rules.xml
@@ -25,7 +25,7 @@
     <rule ref="category/java/codestyle.xml/ClassNamingConventions">
         <properties>
             <property name="abstractClassPattern" value="[A-Z][a-zA-Z0-9]*" />
-            <property name="interfacePattern" value="(?:IF?[A-Z][a-zA-Z0-9]*)|(?:[A-Z][a-zA-Z0-9]+Constants[0-9]*)" />
+            <property name="interfacePattern" value="(?:(?:I|IF)?[A-Z][a-zA-Z0-9]*)|(?:[A-Z][a-zA-Z0-9]+Constants[0-9]*)" />
             <property name="testClassPattern" value="^[A-Z][a-zA-Z0-9]*Test[0-9]*$" />
         </properties>
     </rule>