diff --git a/framework/mail/BaseMessage.php b/framework/mail/BaseMessage.php
index 9e47eb423d..ec04d82f75 100644
--- a/framework/mail/BaseMessage.php
+++ b/framework/mail/BaseMessage.php
@@ -14,8 +14,8 @@ use yii\base\ErrorHandler;
 /**
  * BaseMessage serves as a base class that implements the [[send()]] method required by [[MessageInterface]].
  *
- * By default, [[send()]] will use the "mail" application component to send the current message.
- * The "mail" application component should be a mailer instance implementing [[MailerInterface]].
+ * By default, [[send()]] will use the "mailer" application component to send the current message.
+ * The "mailer" application component should be a mailer instance implementing [[MailerInterface]].
  *
  * @see BaseMailer
  *
@@ -35,7 +35,7 @@ abstract class BaseMessage extends BaseObject implements MessageInterface
      * Sends this email message.
      * @param MailerInterface $mailer the mailer that should be used to send this message.
      * If no mailer is given it will first check if [[mailer]] is set and if not,
-     * the "mail" application component will be used instead.
+     * the "mailer" application component will be used instead.
      * @return bool whether this message is sent successfully.
      */
     public function send(MailerInterface $mailer = null)
diff --git a/framework/mail/MessageInterface.php b/framework/mail/MessageInterface.php
index 28b57a53b7..414d3b778b 100644
--- a/framework/mail/MessageInterface.php
+++ b/framework/mail/MessageInterface.php
@@ -205,7 +205,7 @@ interface MessageInterface
     /**
      * Sends this email message.
      * @param MailerInterface $mailer the mailer that should be used to send this message.
-     * If null, the "mail" application component will be used instead.
+     * If null, the "mailer" application component will be used instead.
      * @return bool whether this message is sent successfully.
      */
     public function send(MailerInterface $mailer = null);