diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingleton.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingletonRule.java
similarity index 98%
rename from pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingleton.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingletonRule.java
index 2344cedd2e..4852abc5ea 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingleton.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingletonRule.java
@@ -19,7 +19,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTReturnStatement;
 import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
-public class SingleMethodSingleton extends AbstractJavaRule {
+public class SingleMethodSingletonRule extends AbstractJavaRule {
 
 	private static Map<String, ASTFieldDeclaration> fieldDecls = new HashMap<String, ASTFieldDeclaration>();
 	private static Set<ASTFieldDeclaration> returnset = new HashSet<ASTFieldDeclaration>();
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingletonClassReturningNewInstance.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingletonClassReturningNewInstanceRule.java
similarity index 97%
rename from pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingletonClassReturningNewInstance.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingletonClassReturningNewInstanceRule.java
index f8eddd1a61..3097ab5c60 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingletonClassReturningNewInstance.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingletonClassReturningNewInstanceRule.java
@@ -13,7 +13,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTPrimaryPrefix;
 import net.sourceforge.pmd.lang.java.ast.ASTReturnStatement;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
-public class SingletonClassReturningNewInstance extends AbstractJavaRule {
+public class SingletonClassReturningNewInstanceRule extends AbstractJavaRule {
 	
 	@Override
 	public Object visit(ASTMethodDeclaration node, Object data) {
diff --git a/pmd-java/src/main/resources/rulesets/java/design.xml b/pmd-java/src/main/resources/rulesets/java/design.xml
index 7869ca43c7..a9d45b6be5 100644
--- a/pmd-java/src/main/resources/rulesets/java/design.xml
+++ b/pmd-java/src/main/resources/rulesets/java/design.xml
@@ -1297,11 +1297,11 @@ public static Foo getFoo() {
         ]]></example>
     </rule>
 
-<rule name="SingleMethodSingletonRule"
+<rule name="SingleMethodSingleton"
 		since="5.4"
 		externalInfoUrl=""
 		message="Class contains multiple getInstance methods. Please review."
-		class="net.sourceforge.pmd.lang.java.rule.design.SingleMethodSingleton">
+		class="net.sourceforge.pmd.lang.java.rule.design.SingleMethodSingletonRule">
 <description>
 Some classes contain overloaded getInstance. The problem with overloaded getInstance methods
 is that the instance created using the overloaded method is not cached and so, 
@@ -1327,11 +1327,11 @@ public static Singleton getInstance(Object obj){
 </example>
 </rule>
 
-<rule name="SingletonClassReturningNewInstanceRule"
+<rule name="SingletonClassReturningNewInstance"
 		since="5.4"
 		externalInfoUrl=""
 		message="getInstance method always creates a new object and hence does not comply to Singleton Design Pattern behaviour. Please review"
-		class="net.sourceforge.pmd.lang.java.rule.design.SingletonClassReturningNewInstance">
+		class="net.sourceforge.pmd.lang.java.rule.design.SingletonClassReturningNewInstanceRule">
 <description>
 Some classes contain overloaded getInstance. The problem with overloaded getInstance methods
 is that the instance created using the overloaded method is not cached and so,