diff --git a/apps/advanced/backend/tests/_config.php b/apps/advanced/backend/tests/_config.php
index 24ec1b56ae..8629dd0d99 100644
--- a/apps/advanced/backend/tests/_config.php
+++ b/apps/advanced/backend/tests/_config.php
@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [
diff --git a/apps/advanced/common/tests/_config.php b/apps/advanced/common/tests/_config.php
index 24ec1b56ae..8629dd0d99 100644
--- a/apps/advanced/common/tests/_config.php
+++ b/apps/advanced/common/tests/_config.php
@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [
diff --git a/apps/advanced/console/tests/_config.php b/apps/advanced/console/tests/_config.php
index 24ec1b56ae..8629dd0d99 100644
--- a/apps/advanced/console/tests/_config.php
+++ b/apps/advanced/console/tests/_config.php
@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [
diff --git a/apps/advanced/frontend/tests/_config.php b/apps/advanced/frontend/tests/_config.php
index 24ec1b56ae..8629dd0d99 100644
--- a/apps/advanced/frontend/tests/_config.php
+++ b/apps/advanced/frontend/tests/_config.php
@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [
diff --git a/apps/basic/tests/_config.php b/apps/basic/tests/_config.php
index 24ec1b56ae..8629dd0d99 100644
--- a/apps/basic/tests/_config.php
+++ b/apps/basic/tests/_config.php
@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [
diff --git a/framework/base/Application.php b/framework/base/Application.php
index 73eda02231..77e7525ec7 100644
--- a/framework/base/Application.php
+++ b/framework/base/Application.php
@@ -24,7 +24,7 @@ use Yii;
  * @property \yii\base\Formatter|\yii\i18n\Formatter $formatter The formatter application component. This property is read-only.
  * @property \yii\i18n\I18N $i18n The internationalization component. This property is read-only.
  * @property \yii\log\Dispatcher $log The log dispatcher component. This property is read-only.
- * @property \yii\mail\MailerInterface $mail The mailer interface. This property is read-only.
+ * @property \yii\mail\MailerInterface $mailer The mailer interface. This property is read-only.
  * @property \yii\web\Request|\yii\console\Request $request The request component. This property is read-only.
  * @property \yii\web\Response|\yii\console\Response $response The response component. This property is
  * read-only.
@@ -566,9 +566,9 @@ abstract class Application extends Module
      * Returns the mailer component.
      * @return \yii\mail\MailerInterface the mailer interface
      */
-    public function getMail()
+    public function getMailer()
     {
-        return $this->get('mail');
+        return $this->get('mailer');
     }
 
     /**
@@ -601,7 +601,7 @@ abstract class Application extends Module
             'view' => ['class' => 'yii\web\View'],
             'formatter' => ['class' => 'yii\base\Formatter'],
             'i18n' => ['class' => 'yii\i18n\I18N'],
-            'mail' => ['class' => 'yii\swiftmailer\Mailer'],
+            'mailer' => ['class' => 'yii\swiftmailer\Mailer'],
             'urlManager' => ['class' => 'yii\web\UrlManager'],
             'assetManager' => ['class' => 'yii\web\AssetManager'],
         ];
diff --git a/tests/unit/framework/mail/BaseMailerTest.php b/tests/unit/framework/mail/BaseMailerTest.php
index 2942626a8d..f54cc45cd7 100644
--- a/tests/unit/framework/mail/BaseMailerTest.php
+++ b/tests/unit/framework/mail/BaseMailerTest.php
@@ -18,7 +18,7 @@ class BaseMailerTest extends TestCase
     {
         $this->mockApplication([
             'components' => [
-                'mail' => $this->createTestMailComponent(),
+                'mailer' => $this->createTestMailComponent(),
             ]
         ]);
         $filePath = $this->getTestFilePath();
@@ -59,7 +59,7 @@ class BaseMailerTest extends TestCase
      */
     protected function getTestMailComponent()
     {
-        return Yii::$app->get('mail');
+        return Yii::$app->get('mailer');
     }
 
     // Tests :