diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
index e8fe0f3a3..d8a20e904 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
@@ -60,9 +60,9 @@ public abstract class AbstractMavenRepositorySearch
 
     protected Logger log = LoggerFactory.getLogger( getClass() );
 
-    public static String TEST_REPO_1 = "nexus-search-test-repo";
+    public static String TEST_REPO_1 = "maven-search-test-repo";
 
-    public static String TEST_REPO_2 = "nexus-search-test-repo-2";
+    public static String TEST_REPO_2 = "maven-search-test-repo-2";
 
 
     public static String REPO_RELEASE = "repo-release";
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo-2/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.pom
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/classname-search/1.0/classname-search-1.0.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/classname-search/1.0/classname-search-1.0.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/classname-search/1.0/classname-search-1.0.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/com/classname-search/1.0/classname-search-1.0.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/com/classname-search/1.0/classname-search-1.0.pom
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom b/archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom
similarity index 100%
rename from archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom
rename to archiva-modules/archiva-base/archiva-indexer/src/test/maven-search-test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom