diff --git a/pmd-java/src/main/resources/rulesets/java/controversial.xml b/pmd-java/src/main/resources/rulesets/java/controversial.xml
index 802e50c84c..ad54f277ab 100644
--- a/pmd-java/src/main/resources/rulesets/java/controversial.xml
+++ b/pmd-java/src/main/resources/rulesets/java/controversial.xml
@@ -38,7 +38,8 @@ They are held here to allow people to include them as they see fit within their
 
     <rule ref="category/java/design.xml/UseObjectForClearerAPI" deprecated="true" />
 
-    <!-- The rule UnnecessaryParentheses has been merged into unnecessary.xml/UselessParentheses -->
-    <rule name="UnnecessaryParentheses" deprecated="true" ref="rulesets/java/unnecessary.xml/UselessParentheses" />
+    <!-- The rule UnnecessaryParentheses has been merged into unnecessary.xml/UselessParentheses,
+         which now lives in codestyle -->
+    <rule name="UnnecessaryParentheses" deprecated="true" ref="category/java/codestyle.xml/UselessParentheses" />
 
 </ruleset>
diff --git a/pmd-java/src/main/resources/rulesets/java/migrating_to_13.xml b/pmd-java/src/main/resources/rulesets/java/migrating_to_13.xml
index b63719861f..50db912c5f 100644
--- a/pmd-java/src/main/resources/rulesets/java/migrating_to_13.xml
+++ b/pmd-java/src/main/resources/rulesets/java/migrating_to_13.xml
@@ -9,11 +9,8 @@
 Contains rules for migrating to JDK 1.3
   </description>
 
- <rule ref="rulesets/java/migrating.xml/ReplaceVectorWithList"/>
- <rule ref="rulesets/java/migrating.xml/ReplaceHashtableWithMap"/>
- <rule ref="rulesets/java/migrating.xml/ReplaceEnumerationWithIterator"/>
+ <rule ref="category/java/bestpractices.xml/ReplaceEnumerationWithIterator" deprecated="true" />
+ <rule ref="category/java/bestpractices.xml/ReplaceHashtableWithMap" deprecated="true" />
+ <rule ref="category/java/bestpractices.xml/ReplaceVectorWithList" deprecated="true" />
 
 </ruleset>
-
-
-
diff --git a/pmd-java/src/main/resources/rulesets/java/migrating_to_14.xml b/pmd-java/src/main/resources/rulesets/java/migrating_to_14.xml
index 201ba79afc..323b7b4272 100644
--- a/pmd-java/src/main/resources/rulesets/java/migrating_to_14.xml
+++ b/pmd-java/src/main/resources/rulesets/java/migrating_to_14.xml
@@ -8,7 +8,7 @@
 Contains rules for migrating to JDK 1.4
   </description>
 
-    <rule ref="rulesets/java/migrating.xml/AvoidAssertAsIdentifier"/>
+    <rule ref="category/java/errorprone.xml/AvoidAssertAsIdentifier" deprecated="true" />
 
 </ruleset>
 
diff --git a/pmd-java/src/main/resources/rulesets/java/migrating_to_15.xml b/pmd-java/src/main/resources/rulesets/java/migrating_to_15.xml
index 97417efbab..d7d2386ef7 100644
--- a/pmd-java/src/main/resources/rulesets/java/migrating_to_15.xml
+++ b/pmd-java/src/main/resources/rulesets/java/migrating_to_15.xml
@@ -8,13 +8,10 @@
 Contains rules for migrating to JDK 1.5
   </description>
 
-  <rule ref="rulesets/java/migrating.xml/AvoidEnumAsIdentifier"/>
-  <rule ref="rulesets/java/migrating.xml/IntegerInstantiation"/>
-  <rule ref="rulesets/java/migrating.xml/LongInstantiation"/>
-  <rule ref="rulesets/java/migrating.xml/ShortInstantiation"/>
-  <rule ref="rulesets/java/migrating.xml/ByteInstantiation"/>
+    <rule ref="category/java/errorprone.xml/AvoidEnumAsIdentifier" deprecated="true" />
+    <rule ref="category/java/performance.xml/ByteInstantiation" deprecated="true" />
+    <rule ref="category/java/performance.xml/IntegerInstantiation" deprecated="true" />
+    <rule ref="category/java/performance.xml/LongInstantiation" deprecated="true" />
+    <rule ref="category/java/performance.xml/ShortInstantiation" deprecated="true" />
 
 </ruleset>
-
-
-
diff --git a/pmd-java/src/main/resources/rulesets/java/migrating_to_junit4.xml b/pmd-java/src/main/resources/rulesets/java/migrating_to_junit4.xml
index e7a79ade1d..696a91f72f 100644
--- a/pmd-java/src/main/resources/rulesets/java/migrating_to_junit4.xml
+++ b/pmd-java/src/main/resources/rulesets/java/migrating_to_junit4.xml
@@ -8,13 +8,10 @@
 Contains rules for migrating to JUnit 4
   </description>
 
-  <rule ref="rulesets/java/migrating.xml/JUnit4TestShouldUseBeforeAnnotation"/>
-  <rule ref="rulesets/java/migrating.xml/JUnit4TestShouldUseTestAnnotation"/>
-  <rule ref="rulesets/java/migrating.xml/JUnit4TestShouldUseAfterAnnotation"/>
-  <rule ref="rulesets/java/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation"/>
-  <rule ref="rulesets/java/migrating.xml/JUnitUseExpected"/>
+    <rule ref="category/java/bestpractices.xml/JUnit4SuitesShouldUseSuiteAnnotation" deprecated="true" />
+    <rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseAfterAnnotation" deprecated="true" />
+    <rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseBeforeAnnotation" deprecated="true" />
+    <rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseTestAnnotation" deprecated="true" />
+    <rule ref="category/java/bestpractices.xml/JUnitUseExpected" deprecated="true" />
 
 </ruleset>
-
-
-