diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala b/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala
index af29de3b0896e2a11f16ed9ac0569e2f5bc134c5..23efcab6caad1abf298d2ba21202a754a86e4cda 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala
@@ -21,7 +21,8 @@ import org.apache.spark.internal.Logging
 import org.apache.spark.rpc._
 
 /**
- * Actor which connects to a worker process and terminates the JVM if the connection is severed.
+ * Endpoint which connects to a worker process and terminates the JVM if the
+ * connection is severed.
  * Provides fate sharing between a worker and its associated child processes.
  */
 private[spark] class WorkerWatcher(
diff --git a/core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala b/core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala
index c6aebc19fd12d295ee947b2f2202b25e38d21c30..bb24c6ce4d33cf494bda259b8a9142c1110c6be8 100644
--- a/core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala
@@ -253,7 +253,7 @@ class MapOutputTrackerSuite extends SparkFunSuite {
       rpcEnv.stop(masterTracker.trackerEndpoint)
       rpcEnv.setupEndpoint(MapOutputTracker.ENDPOINT_NAME, masterEndpoint)
 
-      // Frame size should be ~1.1MB, and MapOutputTrackerMasterActor should throw exception.
+      // Frame size should be ~1.1MB, and MapOutputTrackerMasterEndpoint should throw exception.
       // Note that the size is hand-selected here because map output statuses are compressed before
       // being sent.
       masterTracker.registerShuffle(20, 100)