Index: trunk/tools/pmd/josm-ruleset.xml
===================================================================
--- trunk/tools/pmd/josm-ruleset.xml	(revision 14209)
+++ trunk/tools/pmd/josm-ruleset.xml	(revision 14604)
@@ -55,7 +55,9 @@
     <exclude name="EmptyMethodInAbstractClassShouldBeAbstract"/>
     <exclude name="FieldDeclarationsShouldBeAtStartOfClass"/>
+    <exclude name="FieldNamingConventions"/>
     <exclude name="ForLoopsMustUseBraces"/>
     <exclude name="IfElseStmtsMustUseBraces"/>
     <exclude name="IfStmtsMustUseBraces"/>
+    <exclude name="LinguisticNaming"/>
     <exclude name="LocalVariableCouldBeFinal"/>
     <exclude name="LongVariable"/>
@@ -70,4 +72,5 @@
     <exclude name="UnnecessaryConstructor"/>
     <exclude name="UselessParentheses"/>
+    <exclude name="UseUnderscoresInNumericLiterals"/>
     <exclude name="VariableNamingConventions"/>
     <exclude name="WhileLoopsMustUseBraces"/>
@@ -85,6 +88,7 @@
     </properties>
   </rule>
-  <rule ref="category/java/codestyle.xml/VariableNamingConventions">
+  <rule ref="category/java/codestyle.xml/FieldNamingConventions">
     <properties>
+        <property name="enumConstantPattern" value="[A-Za-z][A-Za-z_0-9]*"/>
         <property name="violationSuppressXPath" value="//FieldDeclaration[@Public='true']
           | //FieldDeclaration/../Annotation/MarkerAnnotation/Name[@Image='pref']