diff --git a/core/src/main/java/org/apache/spark/shuffle/unsafe/SpillInfo.java b/core/src/main/java/org/apache/spark/shuffle/unsafe/SpillInfo.java
index a1b5266631164..5435c2c98428f 100644
--- a/core/src/main/java/org/apache/spark/shuffle/unsafe/SpillInfo.java
+++ b/core/src/main/java/org/apache/spark/shuffle/unsafe/SpillInfo.java
@@ -22,7 +22,7 @@
 import java.io.File;
 
 /**
- * Metadata for a block of data written by {@link UnsafeShuffleSpillWriter}.
+ * Metadata for a block of data written by {@link UnsafeShuffleExternalSorter}.
  */
 final class SpillInfo {
   final long[] partitionLengths;
diff --git a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleSpillWriter.java b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java
similarity index 97%
rename from core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleSpillWriter.java
rename to core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java
index 68f5b080572ea..64ef0f2c07820 100644
--- a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleSpillWriter.java
+++ b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java
@@ -53,9 +53,9 @@
  * spill files. Instead, this merging is performed in {@link UnsafeShuffleWriter}, which uses a
  * specialized merge procedure that avoids extra serialization/deserialization.
  */
-public final class UnsafeShuffleSpillWriter {
+public final class UnsafeShuffleExternalSorter {
 
-  private final Logger logger = LoggerFactory.getLogger(UnsafeShuffleSpillWriter.class);
+  private final Logger logger = LoggerFactory.getLogger(UnsafeShuffleExternalSorter.class);
 
   private static final int SER_BUFFER_SIZE = 1024 * 1024;  // TODO: tune this / don't duplicate
   private static final int PAGE_SIZE = 1024 * 1024;  // TODO: tune this
@@ -86,14 +86,14 @@ public final class UnsafeShuffleSpillWriter {
   private MemoryBlock currentPage = null;
   private long currentPagePosition = -1;
 
-  public UnsafeShuffleSpillWriter(
-      TaskMemoryManager memoryManager,
-      ShuffleMemoryManager shuffleMemoryManager,
-      BlockManager blockManager,
-      TaskContext taskContext,
-      int initialSize,
-      int numPartitions,
-      SparkConf conf) throws IOException {
+  public UnsafeShuffleExternalSorter(
+    TaskMemoryManager memoryManager,
+    ShuffleMemoryManager shuffleMemoryManager,
+    BlockManager blockManager,
+    TaskContext taskContext,
+    int initialSize,
+    int numPartitions,
+    SparkConf conf) throws IOException {
     this.memoryManager = memoryManager;
     this.shuffleMemoryManager = shuffleMemoryManager;
     this.blockManager = blockManager;
diff --git a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java
index 80e01109eabd4..995754901e09b 100644
--- a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java
+++ b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java
@@ -118,7 +118,7 @@ private void freeMemory() {
 
   private SpillInfo[] insertRecordsIntoSorter(
       scala.collection.Iterator<? extends Product2<K, V>> records) throws Exception {
-    final UnsafeShuffleSpillWriter sorter = new UnsafeShuffleSpillWriter(
+    final UnsafeShuffleExternalSorter sorter = new UnsafeShuffleExternalSorter(
       memoryManager,
       shuffleMemoryManager,
       blockManager,