diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/LocusWalker.java b/java/src/org/broadinstitute/sting/gatk/walkers/LocusWalker.java
index 74e8848cd..eab39bf64 100755
--- a/java/src/org/broadinstitute/sting/gatk/walkers/LocusWalker.java
+++ b/java/src/org/broadinstitute/sting/gatk/walkers/LocusWalker.java
@@ -5,7 +5,6 @@ import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker;
 import org.broadinstitute.sting.gatk.contexts.AlignmentContext;
 import org.broadinstitute.sting.gatk.contexts.ReferenceContext;
 import org.broadinstitute.sting.gatk.iterators.LocusIteratorFilter;
-import net.sf.picard.filter.SamRecordFilter;
 
 import java.util.List;
 import java.util.Arrays;
@@ -19,7 +18,7 @@ import java.util.Arrays;
  */
 @By(DataSource.READS)
 @Requires({DataSource.READS,DataSource.REFERENCE, DataSource.REFERENCE_BASES})
-@PartitionBy(PartitionType.Interval)
+@PartitionBy(PartitionType.INTERVAL)
 @ReadFilters({UnmappedReadFilter.class,NotPrimaryAlignmentReadFilter.class,DuplicateReadFilter.class,FailsVendorQualityCheckReadFilter.class})
 public abstract class LocusWalker<MapType, ReduceType> extends Walker<MapType, ReduceType> {
     // Do we actually want to operate on the context?
diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/PartitionType.java b/java/src/org/broadinstitute/sting/gatk/walkers/PartitionType.java
index f6bb705a3..361e222c2 100644
--- a/java/src/org/broadinstitute/sting/gatk/walkers/PartitionType.java
+++ b/java/src/org/broadinstitute/sting/gatk/walkers/PartitionType.java
@@ -32,23 +32,23 @@ public enum PartitionType {
     /**
      * Do not partition the walker inputs.
      */
-    None,
+    NONE,
 
     /**
      * The walker inputs can be chunked down to the
      * per-locus level.
      */
-    Locus,
+    LOCUS,
 
     /**
      * The walker inputs should be processed as complete
      * intervals defined -L or the reference contigs.
      */
-    Interval,
+    INTERVAL,
 
     /**
      * The walker inputs should always be processed as complete
      * contigs, even if there are multiple intervals per contig.
      */
-    Contig
+    CONTIG
 }
diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/ReadWalker.java b/java/src/org/broadinstitute/sting/gatk/walkers/ReadWalker.java
index fd4dc0522..a5486fd9a 100755
--- a/java/src/org/broadinstitute/sting/gatk/walkers/ReadWalker.java
+++ b/java/src/org/broadinstitute/sting/gatk/walkers/ReadWalker.java
@@ -12,7 +12,7 @@ import org.broadinstitute.sting.gatk.contexts.ReferenceContext;
  * To change this template use File | Settings | File Templates.
  */
 @Requires({DataSource.READS, DataSource.REFERENCE_BASES})
-@PartitionBy(PartitionType.Contig)
+@PartitionBy(PartitionType.CONTIG)
 public abstract class ReadWalker<MapType, ReduceType> extends Walker<MapType, ReduceType> {
     public boolean requiresOrderedReads() { return false; }
     
diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/Walker.java b/java/src/org/broadinstitute/sting/gatk/walkers/Walker.java
index 296887d87..f0ba8bb46 100755
--- a/java/src/org/broadinstitute/sting/gatk/walkers/Walker.java
+++ b/java/src/org/broadinstitute/sting/gatk/walkers/Walker.java
@@ -42,7 +42,7 @@ import org.apache.log4j.Logger;
  * To change this template use File | Settings | File Templates.
  */
 @ReadFilters(MalformedReadFilter.class)
-@PartitionBy(PartitionType.None)
+@PartitionBy(PartitionType.NONE)
 @BAQMode(QualityMode = BAQ.QualityMode.OVERWRITE_QUALS, ApplicationTime = BAQ.ApplicationTime.ON_INPUT)
 public abstract class Walker<MapType, ReduceType> {
     final protected static Logger logger = Logger.getLogger(Walker.class);
diff --git a/java/src/org/broadinstitute/sting/queue/extensions/gatk/GATKExtensionsGenerator.java b/java/src/org/broadinstitute/sting/queue/extensions/gatk/GATKExtensionsGenerator.java
index 45160090e..62e0f257a 100644
--- a/java/src/org/broadinstitute/sting/queue/extensions/gatk/GATKExtensionsGenerator.java
+++ b/java/src/org/broadinstitute/sting/queue/extensions/gatk/GATKExtensionsGenerator.java
@@ -41,7 +41,6 @@ import org.broadinstitute.sting.gatk.io.stubs.SAMFileWriterArgumentTypeDescripto
 import org.broadinstitute.sting.gatk.refdata.tracks.builders.RMDTrackBuilder;
 import org.broadinstitute.sting.gatk.walkers.PartitionBy;
 import org.broadinstitute.sting.gatk.walkers.PartitionType;
-import org.broadinstitute.sting.gatk.walkers.ReadWalker;
 import org.broadinstitute.sting.gatk.walkers.Walker;
 import org.broadinstitute.sting.utils.classloader.JVMUtils;
 import org.broadinstitute.sting.utils.classloader.PluginManager;
@@ -213,9 +212,9 @@ public class GATKExtensionsGenerator extends CommandLineProgram {
      */
     private String getScatterClass(Class<? extends Walker> walkerType) {
         PartitionType partitionType = walkerType.getAnnotation(PartitionBy.class).value();
-        if (partitionType == PartitionType.None)
+        if (partitionType == PartitionType.NONE)
             return null;
-        return partitionType.name() + "ScatterFunction";
+        return StringUtils.capitalize(partitionType.name().toLowerCase()) + "ScatterFunction";
     }
 
     /**
diff --git a/scala/qscript/examples/ExampleUnifiedGenotyper.scala b/scala/qscript/examples/ExampleUnifiedGenotyper.scala
index 2908d23f3..b630df96f 100644
--- a/scala/qscript/examples/ExampleUnifiedGenotyper.scala
+++ b/scala/qscript/examples/ExampleUnifiedGenotyper.scala
@@ -4,7 +4,6 @@ import org.broadinstitute.sting.queue.extensions.gatk._
 /**
  * An example building on the intro ExampleCountReads.scala.
  * Runs an INCOMPLETE version of the UnifiedGenotyper with VariantEval and optional VariantFiltration.
- * If run on a compute cluster, splits the UnifiedGenotyper into 3 parts.
  */
 class ExampleUnifiedGenotyper extends QScript {
   // Create an alias 'qscript' to be able to access variables