diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index ff566995cc22c5ebe48bd473f503591cab11c676..2c5931de6cad7e618349efa6eb8231b2f7e36024 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -317,7 +317,7 @@ $config = array(
             'VuFind\AuthManager' => 'VuFind\Auth\Manager',
             'VuFind\Cart' => 'VuFind\Cart',
             'VuFind\CacheManager' => 'VuFind\Cache\Manager',
-            'mailer' => 'VuFind\Mailer',
+            'VuFind\Mailer' => 'VuFind\Mailer',
             'recordloader' => 'VuFind\Record\Loader',
             'searchspecsreader' => 'VuFind\Config\SearchSpecsReader',
             'sessionmanager' => 'Zend\Session\SessionManager',
diff --git a/module/VuFind/src/VuFind/Controller/AbstractRecord.php b/module/VuFind/src/VuFind/Controller/AbstractRecord.php
index 546f140728ccf037ac0e19435317bd51615db464..71cdc03d3987f67404d8017a99e12b12cb1406c2 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractRecord.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractRecord.php
@@ -307,7 +307,7 @@ class AbstractRecord extends AbstractBase
 
             // Attempt to send the email and show an appropriate flash message:
             try {
-                $this->getServiceLocator()->get('Mailer')->sendRecord(
+                $this->getServiceLocator()->get('VuFind\Mailer')->sendRecord(
                     $view->to, $view->from, $view->message, $driver,
                     $this->getViewRenderer()
                 );
diff --git a/module/VuFind/src/VuFind/Controller/AjaxController.php b/module/VuFind/src/VuFind/Controller/AjaxController.php
index 3069516272fc80f192996e2f377c9fa4f8ebde2d..fb44a00bac1a4aa74632ec2b5567b4584618a13c 100644
--- a/module/VuFind/src/VuFind/Controller/AjaxController.php
+++ b/module/VuFind/src/VuFind/Controller/AjaxController.php
@@ -966,7 +966,7 @@ class AjaxController extends AbstractBase
                 $this->params()->fromPost('id'),
                 $this->params()->fromPost('source', 'VuFind')
             );
-            $this->getServiceLocator()->get('Mailer')->sendRecord(
+            $this->getServiceLocator()->get('VuFind\Mailer')->sendRecord(
                 $this->params()->fromPost('to'), $this->params()->fromPost('from'),
                 $this->params()->fromPost('message'), $record,
                 $this->getViewRenderer()
@@ -998,7 +998,7 @@ class AjaxController extends AbstractBase
 
         // Attempt to send the email:
         try {
-            $this->getServiceLocator()->get('Mailer')->sendLink(
+            $this->getServiceLocator()->get('VuFind\Mailer')->sendLink(
                 $this->params()->fromPost('to'), $this->params()->fromPost('from'),
                 $this->params()->fromPost('message'),
                 $url, $this->getViewRenderer(), $this->params()->fromPost('subject')
diff --git a/module/VuFind/src/VuFind/Controller/CartController.php b/module/VuFind/src/VuFind/Controller/CartController.php
index 6efe3d8f96b30ea2f4ce061a1582b788d1a0c937..c7bdffa0cd9e269f0be0e895727f5651f3d97e8d 100644
--- a/module/VuFind/src/VuFind/Controller/CartController.php
+++ b/module/VuFind/src/VuFind/Controller/CartController.php
@@ -192,7 +192,7 @@ class CartController extends AbstractBase
             // Attempt to send the email and show an appropriate flash message:
             try {
                 // If we got this far, we're ready to send the email:
-                $this->getServiceLocator()->get('Mailer')->sendLink(
+                $this->getServiceLocator()->get('VuFind\Mailer')->sendLink(
                     $view->to, $view->from, $view->message,
                     $url, $this->getViewRenderer(), 'bulk_email_title'
                 );
diff --git a/module/VuFind/src/VuFind/Controller/SearchController.php b/module/VuFind/src/VuFind/Controller/SearchController.php
index b5ee0229585bae21ce6a898988a661442151b82a..cac7dec2498171efc03d36d814b9e30a517515db 100644
--- a/module/VuFind/src/VuFind/Controller/SearchController.php
+++ b/module/VuFind/src/VuFind/Controller/SearchController.php
@@ -99,7 +99,7 @@ class SearchController extends AbstractSearch
             // Attempt to send the email and show an appropriate flash message:
             try {
                 // If we got this far, we're ready to send the email:
-                $this->getServiceLocator()->get('Mailer')->sendLink(
+                $this->getServiceLocator()->get('VuFind\Mailer')->sendLink(
                     $view->to, $view->from, $view->message,
                     $view->url, $this->getViewRenderer()
                 );
diff --git a/module/VuFind/src/VuFind/Log/Logger.php b/module/VuFind/src/VuFind/Log/Logger.php
index ef5ddb73577a05440ceab08fcf6d0a3dbb845ed2..e71b1e553634ca17f8f4cc16d2b36bac61b285d8 100644
--- a/module/VuFind/src/VuFind/Log/Logger.php
+++ b/module/VuFind/src/VuFind/Log/Logger.php
@@ -121,7 +121,7 @@ class Logger extends BaseLogger implements ServiceLocatorAwareInterface
             $error_types = isset($parts[1]) ? $parts[1] : '';
 
             // use smtp
-            $mailer = $this->getServiceLocator()->get('Mailer');
+            $mailer = $this->getServiceLocator()->get('VuFind\Mailer');
             $msg = $mailer->getNewMessage()
                 ->addFrom($config->Site->email)
                 ->addTo($email)