diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingletonRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingleton.java
similarity index 98%
rename from pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingletonRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingleton.java
index 4852abc5ea..2344cedd2e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingletonRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingleMethodSingleton.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 SingleMethodSingletonRule extends AbstractJavaRule {
+public class SingleMethodSingleton 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/resources/rulesets/java/design.xml b/pmd-java/src/main/resources/rulesets/java/design.xml
index dcadfd769d..7869ca43c7 100644
--- a/pmd-java/src/main/resources/rulesets/java/design.xml
+++ b/pmd-java/src/main/resources/rulesets/java/design.xml
@@ -1298,8 +1298,10 @@ public static Foo getFoo() {
     </rule>
 
 <rule name="SingleMethodSingletonRule"
+		since="5.4"
+		externalInfoUrl=""
 		message="Class contains multiple getInstance methods. Please review."
-		class="net.sourceforge.pmd.lang.java.rule.design.SingleMethodSingletonRule">
+		class="net.sourceforge.pmd.lang.java.rule.design.SingleMethodSingleton">
 <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, 
@@ -1325,7 +1327,9 @@ public static Singleton getInstance(Object obj){
 </example>
 </rule>
 
-<rule name="SingletonClassReturningNewInstance"
+<rule name="SingletonClassReturningNewInstanceRule"
+		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">
 <description>
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java
index 2d672286d2..743dddae0c 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java
@@ -46,7 +46,7 @@ public class DesignRulesTest extends SimpleAggregatorTst {
         addRule(RULESET, "NonCaseLabelInSwitchStatement");
         addRule(RULESET, "NonStaticInitializer");
         addRule(RULESET, "NonThreadSafeSingleton");
-        addRule(RULESET,"SingleMethodSingletonRule");
+        addRule(RULESET,"SingleMethodSingleton");
         addRule(RULESET, "SingletonClassReturningNewInstance");
         addRule(RULESET, "OptimizableToArrayCall");
         // addRule(RULESET, "PositionalIteratorRule"); This rule does not yet
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SingleMethodSingletonRule.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SingleMethodSingleton.xml
similarity index 100%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SingleMethodSingletonRule.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SingleMethodSingleton.xml