diff --git a/build.xml b/build.xml
index 232b074f6..ce9ab0c4d 100644
--- a/build.xml
+++ b/build.xml
@@ -993,7 +993,7 @@
         </antcall>
     </target>
 
-    <!-- Our four different test conditions: Test, IntegrationTest, PerformanceTest, PipelineTest -->
+    <!-- Our four different test conditions: Test, IntegrationTest, LargeScaleTest, PipelineTest -->
     <target name="test" depends="init.buildall,test.compile,vcf.jar,test.init" description="Run unit tests">
         <condition property="ttype" value="*UnitTest" else="${single}">
             <not><isset property="single"/></not>
@@ -1010,13 +1010,13 @@
     </target>
     <target name="integrationtest.public" depends="init.buildpublic,integrationtest"/>
 
-    <target name="performancetest" depends="init.buildall,test.compile,test.init" description="Run performance tests">
-       <condition property="ptype" value="*PerformanceTest" else="${single}">
+    <target name="largescaletest" depends="init.buildall,test.compile,test.init" description="Run large-scale tests">
+       <condition property="ptype" value="*LargeScaleTest" else="${single}">
             <not><isset property="single"/></not>
         </condition>
         <run-test testtype="${ptype}" outputdir="${report}/${ptype}" classpath="${testng.classpath}" runfailed="false"/>
     </target>
-    <target name="performancetest.public" depends="init.buildpublic,performancetest" />
+    <target name="largescaletest.public" depends="init.buildpublic,largescaletest" />
 
     <target name="pipelinetest" depends="init.buildall,test.compile,test.init" description="Run pipeline tests">
         <condition property="pipetype" value="*PipelineTest" else="${single}">
@@ -1043,8 +1043,8 @@
         <run-test testtype="${report}/*IntegrationTest/testng-failed.xml" outputdir="${report}/failed_rerun" classpath="${testng.classpath}" runfailed="true"/>
     </target>
 
-    <target name="failed-performance" depends="init.buildall,test.compile,test.init">
-        <run-test testtype="${report}/*PerformanceTest/testng-failed.xml" outputdir="${report}/failed_rerun" classpath="${testng.classpath}" runfailed="true"/>
+    <target name="failed-largescale" depends="init.buildall,test.compile,test.init">
+        <run-test testtype="${report}/*LargeScaleTest/testng-failed.xml" outputdir="${report}/failed_rerun" classpath="${testng.classpath}" runfailed="true"/>
     </target>
 
     <target name="failed-pipeline" depends="init.buildall,test.compile,test.init">
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperPerformanceTest.java b/public/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperLargeScaleTest.java
similarity index 96%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperPerformanceTest.java
rename to public/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperLargeScaleTest.java
index 3ff453dab..109088875 100755
--- a/public/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperPerformanceTest.java
+++ b/public/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperLargeScaleTest.java
@@ -5,7 +5,7 @@ import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 
-public class UnifiedGenotyperPerformanceTest extends WalkerTest {
+public class UnifiedGenotyperLargeScaleTest extends WalkerTest {
 
     @Test
     public void testUnifiedGenotyperWholeGenome() {
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerPerformanceTest.java b/public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerLargeScaleTest.java
similarity index 97%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerPerformanceTest.java
rename to public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerLargeScaleTest.java
index 77675b0f4..4526fc0d7 100755
--- a/public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerPerformanceTest.java
+++ b/public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerLargeScaleTest.java
@@ -5,7 +5,7 @@ import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 
-public class IndelRealignerPerformanceTest extends WalkerTest {
+public class IndelRealignerLargeScaleTest extends WalkerTest {
     @Test
     public void testHighCoverage() {
         WalkerTestSpec spec = new WalkerTestSpec(
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorPerformanceTest.java b/public/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorLargeScaleTest.java
similarity index 95%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorPerformanceTest.java
rename to public/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorLargeScaleTest.java
index cc37cc191..3203ee100 100755
--- a/public/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorPerformanceTest.java
+++ b/public/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorLargeScaleTest.java
@@ -5,7 +5,7 @@ import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 
-public class RealignerTargetCreatorPerformanceTest extends WalkerTest {
+public class RealignerTargetCreatorLargeScaleTest extends WalkerTest {
     @Test
     public void testRealignerTargetCreator() {
 
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/recalibration/RecalibrationWalkersPerformanceTest.java b/public/java/test/org/broadinstitute/sting/gatk/walkers/recalibration/RecalibrationWalkersLargeScaleTest.java
similarity index 98%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/recalibration/RecalibrationWalkersPerformanceTest.java
rename to public/java/test/org/broadinstitute/sting/gatk/walkers/recalibration/RecalibrationWalkersLargeScaleTest.java
index bccb95795..3f956e3b9 100755
--- a/public/java/test/org/broadinstitute/sting/gatk/walkers/recalibration/RecalibrationWalkersPerformanceTest.java
+++ b/public/java/test/org/broadinstitute/sting/gatk/walkers/recalibration/RecalibrationWalkersLargeScaleTest.java
@@ -6,7 +6,7 @@ import org.testng.annotations.Test;
 import java.util.ArrayList;
 
 
-public class RecalibrationWalkersPerformanceTest extends WalkerTest {
+public class RecalibrationWalkersLargeScaleTest extends WalkerTest {
 
     private void testCountCovariatesWholeGenomeRunner(String moreArgs) {
         WalkerTestSpec spec = new WalkerTestSpec(