diff --git a/core/src/main/scala/org/apache/spark/deploy/client/DriverClient.scala b/core/src/main/scala/org/apache/spark/deploy/client/DriverClient.scala
index 625730383017fe72cde8265aa461100d6dffc635..a5f57637fb921d58d6ab3ec9e07127f9a37ef1ad 100644
--- a/core/src/main/scala/org/apache/spark/deploy/client/DriverClient.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/client/DriverClient.scala
@@ -43,7 +43,7 @@ class DriverActor(master: String, response: Promise[(Boolean, String)]) extends
       response.success((success, message))
     }
 
-    // Relay all other messages to the server.
+    // Relay all other messages to the master.
     case message => {
       logInfo(s"Sending message to master $master...")
       val masterActor = context.actorSelection(Master.toAkkaUrl(master))
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
index efb9bf49f424abab663727720d7a081e530ec1a2..b8655c78db2b53d99a479b7d5616157bd264765f 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
@@ -189,7 +189,7 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act
         // TODO: It might be good to instead have the submission client poll the master to determine
         //       the current status of the driver. For now it's simply "fire and forget".
 
-        sender ! SubmitDriverResponse(true, "Driver successfully submitted")
+        sender ! SubmitDriverResponse(true, s"Driver successfully submitted as ${driver.id}")
       }
     }