diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 80ebd7b89..70f6cfb9d 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -19,7 +19,7 @@ use System\Twig\Engine as TwigEngine;
 use System\Twig\Loader as TwigLoader;
 use System\Twig\Extension as TwigExtension;
 use System\Models\EventLog;
-use System\Models\MailSettings;
+use System\Models\MailSetting;
 use System\Models\MailTemplate;
 use System\Classes\CombineAssets;
 use Backend\Classes\WidgetManager;
@@ -284,8 +284,8 @@ class ServiceProvider extends ModuleServiceProvider
          * Override system mailer with mail settings
          */
         Event::listen('mailer.beforeRegister', function () {
-            if (MailSettings::isConfigured()) {
-                MailSettings::applyConfigValues();
+            if (MailSetting::isConfigured()) {
+                MailSetting::applyConfigValues();
             }
         });
 
@@ -397,7 +397,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'description' => 'system::lang.mail.menu_description',
                     'category'    => SettingsManager::CATEGORY_MAIL,
                     'icon'        => 'icon-envelope',
-                    'class'       => 'System\Models\MailSettings',
+                    'class'       => 'System\Models\MailSetting',
                     'permissions' => ['system.manage_mail_settings'],
                     'order'       => 600
                 ],
diff --git a/modules/system/models/MailSettings.php b/modules/system/models/MailSetting.php
similarity index 99%
rename from modules/system/models/MailSettings.php
rename to modules/system/models/MailSetting.php
index e7df48b89..ae3aa62f1 100644
--- a/modules/system/models/MailSettings.php
+++ b/modules/system/models/MailSetting.php
@@ -9,7 +9,7 @@ use Model;
  * @package october\system
  * @author Alexey Bobkov, Samuel Georges
  */
-class MailSettings extends Model
+class MailSetting extends Model
 {
     use \October\Rain\Database\Traits\Validation;
 
diff --git a/modules/system/models/mailsettings/_drivers_hint.htm b/modules/system/models/mailsetting/_drivers_hint.htm
similarity index 100%
rename from modules/system/models/mailsettings/_drivers_hint.htm
rename to modules/system/models/mailsetting/_drivers_hint.htm
diff --git a/modules/system/models/mailsettings/fields.yaml b/modules/system/models/mailsetting/fields.yaml
similarity index 98%
rename from modules/system/models/mailsettings/fields.yaml
rename to modules/system/models/mailsetting/fields.yaml
index a6b913b99..b28e14e22 100644
--- a/modules/system/models/mailsettings/fields.yaml
+++ b/modules/system/models/mailsetting/fields.yaml
@@ -22,7 +22,7 @@ tabs:
 
         drivers_hint:
             type: partial
-            path: ~/modules/system/models/mailsettings/_drivers_hint.htm
+            path: ~/modules/system/models/mailsetting/_drivers_hint.htm
             tab: system::lang.mail.general
             trigger:
                 action: show