Index: src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java
===================================================================
--- src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java	(revision 343971)
+++ src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java	(working copy)
@@ -25,8 +25,8 @@
   SingleFieldTestDb db1 = new SingleFieldTestDb(docs1, fieldName);
 
   public void normalTest1(String query, int[] expdnrs) throws Exception {
-    BooleanQueryTest bqt = new BooleanQueryTest( query, expdnrs, db1, fieldName, this,
-                                                new BasicQueryFactory(maxBasicQueries));
+    BooleanQueryTst bqt = new BooleanQueryTst( query, expdnrs, db1, fieldName, this,
+                                               new BasicQueryFactory(maxBasicQueries));
     bqt.setVerbose(verbose);
     bqt.doTest();
   }
Index: src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java
===================================================================
--- src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java	(revision 343971)
+++ src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java	(working copy)
@@ -41,7 +41,7 @@
   };
 
   public void test01Exceptions() throws Exception {
-    String m = ExceptionQueryTest.getFailQueries(exceptionQueries, verbose);
+    String m = ExceptionQueryTst.getFailQueries(exceptionQueries, verbose);
     if (m.length() > 0) {
       fail("No ParseException for:\n" + m);
     }
Index: src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java
===================================================================
--- src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java	(revision 343971)
+++ src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java	(working copy)
@@ -24,7 +24,7 @@
   };
   
   public void test00Exceptions() throws Exception {
-    String m = ExceptionQueryTest.getFailQueries(exceptionQueries, verbose);
+    String m = ExceptionQueryTst.getFailQueries(exceptionQueries, verbose);
     if (m.length() > 0) {
       fail("No ParseException for:\n" + m);
     }
@@ -51,14 +51,14 @@
   SingleFieldTestDb db2 = new SingleFieldTestDb(docs2, fieldName);
 
   public void distanceTest1(String query, int[] expdnrs) throws Exception {
-    BooleanQueryTest bqt = new BooleanQueryTest( query, expdnrs, db1, fieldName, this,
+    BooleanQueryTst bqt = new BooleanQueryTst( query, expdnrs, db1, fieldName, this,
                                                 new BasicQueryFactory(maxBasicQueries));
     bqt.setVerbose(verbose);
     bqt.doTest();
   }
 
   public void distanceTest2(String query, int[] expdnrs) throws Exception {
-    BooleanQueryTest bqt = new BooleanQueryTest( query, expdnrs, db2, fieldName, this,
+    BooleanQueryTst bqt = new BooleanQueryTst( query, expdnrs, db2, fieldName, this,
                                                 new BasicQueryFactory(maxBasicQueries));
     bqt.setVerbose(verbose);
     bqt.doTest();