diff --git a/pmd/rulesets/naming.xml b/pmd/rulesets/naming.xml
index 599e5c1d38..99faf659c1 100644
--- a/pmd/rulesets/naming.xml
+++ b/pmd/rulesets/naming.xml
@@ -11,10 +11,10 @@ The Naming Ruleset contains a collection of rules about names - too long, too sh
 
 
   <rule name="ShortVariable"
-  		  since="0.3"
+  	since="0.3"
         message="Avoid variables with short names like {0}"
         class="net.sourceforge.pmd.rules.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#ShortVariable">
+        externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#ShortVariable">
     <description>
 Detects when a field, local, or parameter has a very short name.
     </description>
@@ -238,7 +238,7 @@ public class MyClass {
      </rule>
 
     <rule name="SuspiciousHashcodeMethodName"
-    		 since="1.5"
+    	  since="1.5"
           message="The method name and return type are suspiciously close to hashCode()"
           class="net.sourceforge.pmd.rules.naming.SuspiciousHashcodeMethodName"
           externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#SuspiciousHashcodeMethodName">
@@ -259,7 +259,7 @@ public class Foo {
      </rule>
 
     <rule name="SuspiciousConstantFieldName"
-    		 since="2.0"
+          since="2.0"
           message="The field name indicates a constant but its modifiers do not"
           class="net.sourceforge.pmd.rules.XPathRule"
           externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#SuspiciousConstantFieldName">
@@ -292,11 +292,10 @@ public class Foo {
        </example>
      </rule>
 
-    <rule
-        name="SuspiciousEqualsMethodName"
-        since="2.0"
-        message="The method name and parameter number are suspiciously close to equals(Object)"
-        class="net.sourceforge.pmd.rules.XPathRule"
+    <rule name="SuspiciousEqualsMethodName"
+          since="2.0"
+          message="The method name and parameter number are suspiciously close to equals(Object)"
+          class="net.sourceforge.pmd.rules.XPathRule"
           externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#SuspiciousEqualsMethodName">
         <description>
 The method name and parameter number are suspiciously close to
@@ -347,7 +346,7 @@ public class Foo {
     </rule>
 
     <rule name="AvoidFieldNameMatchingTypeName"
-    		 since="3.0"
+          since="3.0"
           message="It is somewhat confusing to have a field name matching the declaring class name"
           class="net.sourceforge.pmd.rules.AvoidFieldNameMatchingTypeName"
           externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#AvoidFieldNameMatchingTypeName">
@@ -367,7 +366,7 @@ public class Foo extends Bar {
     </rule>
 
     <rule name="AvoidFieldNameMatchingMethodName"
-    		 since="3.0"
+          since="3.0"
           message="It is somewhat confusing to have a field name with the same name as a method"
           class="net.sourceforge.pmd.rules.AvoidFieldNameMatchingMethodName"
           externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#AvoidFieldNameMatchingMethodName">
@@ -392,9 +391,9 @@ public class Foo {
 
 
     <rule name="NoPackage"
-        since="3.3"
-        message="All classes and interfaces must belong to a named package"
-        class="net.sourceforge.pmd.rules.XPathRule"
+          since="3.3"
+          message="All classes and interfaces must belong to a named package"
+          class="net.sourceforge.pmd.rules.XPathRule"
           externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#NoPackage">
     <description>
 Detects when a class or interface does not have a package definition.
@@ -419,9 +418,9 @@ public class ClassInDefaultPackage {
   </rule>
 
     <rule name="PackageCase"
-            since="3.3"
-            message="Package name contains upper case characters"
-            class="net.sourceforge.pmd.rules.XPathRule"
+          since="3.3"
+          message="Package name contains upper case characters"
+          class="net.sourceforge.pmd.rules.XPathRule"
           externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#PackageCase">
         <description>
     Detects when a package definition contains upper case characters.
@@ -479,10 +478,10 @@ indicates a field and thus is confusing.
     </rule>
 
     <rule name="BooleanGetMethodName"
-        since="4.0"
-        message="A 'getX()' method which returns a boolean should be named 'isX()'"
-        class="net.sourceforge.pmd.rules.XPathRule"
-        externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#BooleanGetMethodName">
+          since="4.0"
+          message="A 'getX()' method which returns a boolean should be named 'isX()'"
+          class="net.sourceforge.pmd.rules.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#BooleanGetMethodName">
         <description>
 Looks for methods named 'getX()' with 'boolean' as the return type. The convention
 is to name these methods 'isX()'.
@@ -514,10 +513,10 @@ public boolean getFoo(boolean bar); // ok, unless checkParameterizedMethods=true
     </rule>
 
    <rule name="GenericsNaming"
-        since="4.2.6"
-        message="Generics names should be a one letter long and upper case."
-        class="net.sourceforge.pmd.rules.XPathRule"
-        externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#GenericsNaming">
+         since="4.2.6"
+         message="Generics names should be a one letter long and upper case."
+         class="net.sourceforge.pmd.rules.XPathRule"
+         externalInfoUrl="http://pmd.sourceforge.net/rules/naming.html#GenericsNaming">
         <description>
 Generics names should be a one letter long and upper case.
         </description>