diff --git a/lucene/tools/custom-tasks.xml b/lucene/tools/custom-tasks.xml
index 4c414f0ab48..e230bb39da3 100644
--- a/lucene/tools/custom-tasks.xml
+++ b/lucene/tools/custom-tasks.xml
@@ -39,11 +39,13 @@
     
     <!-- Some typical snapshot/minimalized JAR suffixes. -->
     <replaceregex pattern="-min$" replace="" flags="gi" />
-    <replaceregex pattern="SNAPSHOT$" replace="" flags="gi" />
+    <replaceregex pattern="SNAPSHOT" replace="" flags="gi" />
 
     <!-- Typical version patterns. -->
     <replaceregex pattern="\.rc[0-9]+" replace="" flags="gi" />
-    <replaceregex pattern="\-(r)?([0-9\-\_\.])+((b(eta)?)|((a(lpha)?))([0-9\-\.])*)?(\-tests)?$" replace="" flags="gi" />
+    <replaceregex pattern="\-(r)?([0-9\-\_\.])+(([a-zA-Z]+)([0-9\-\.])*)?" replace="" flags="gi" />
+    
+    <replaceregex pattern="tests$" replace="-tests" flags="gi" />
 
     <!-- git hashcode pattern: its always 40 chars right? -->
     <replaceregex pattern="\-[a-z0-9]{40,40}$" replace="" flags="gi" />
diff --git a/solr/licenses/hadoop-common-2.0.0-cdh4.2.0-SNAPSHOT-tests-NOTICE.txt b/solr/licenses/hadoop-common-tests-NOTICE.txt
similarity index 100%
rename from solr/licenses/hadoop-common-2.0.0-cdh4.2.0-SNAPSHOT-tests-NOTICE.txt
rename to solr/licenses/hadoop-common-tests-NOTICE.txt
diff --git a/solr/licenses/isoparser-1.0-RC-LICENSE-ASL.txt b/solr/licenses/isoparser-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/isoparser-1.0-RC-LICENSE-ASL.txt
rename to solr/licenses/isoparser-LICENSE-ASL.txt
diff --git a/solr/licenses/isoparser-1.0-RC-NOTICE.txt b/solr/licenses/isoparser-NOTICE.txt
similarity index 100%
rename from solr/licenses/isoparser-1.0-RC-NOTICE.txt
rename to solr/licenses/isoparser-NOTICE.txt