diff --git a/notifyall/NotifyAllEMail.php b/notifyall/NotifyAllEmail.php
similarity index 95%
rename from notifyall/NotifyAllEMail.php
rename to notifyall/NotifyAllEmail.php
index eeca4fafb..96a57a67f 100644
--- a/notifyall/NotifyAllEMail.php
+++ b/notifyall/NotifyAllEmail.php
@@ -6,12 +6,12 @@ use Friendica\App\BaseURL;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\L10n;
-use Friendica\Object\EMail;
+use Friendica\Object\Email;
 
 /**
  * Class for creating a Notify-All EMail
  */
-class NotifyAllEMail extends EMail
+class NotifyAllEmail extends Email
 {
 	public function __construct(L10n $l10n, IConfig $config, BaseURL $baseUrl, string $text)
 	{
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index c2391fcc0..6d1793804 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -8,7 +8,7 @@
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> (Port to Friendica)
  */
 
-use Friendica\Addon\notifyall\NotifyAllEMail;
+use Friendica\Addon\notifyall\NotifyAllEmail;
 use Friendica\App;
 use Friendica\Database\DBA;
 use Friendica\Core\Logger;
@@ -60,7 +60,7 @@ function notifyall_post(App $a)
 		return;
 	}
 
-	$notifyEmail = new NotifyAllEMail(DI::l10n(), DI::config(), DI::baseUrl(), $text);
+	$notifyEmail = new NotifyAllEmail(DI::l10n(), DI::config(), DI::baseUrl(), $text);
 
 	foreach ($recipients as $recipient) {
 		DI::emailer()->send($notifyEmail->withRecipient($recipient['email']));
diff --git a/securemail/SecureTestEMail.php b/securemail/SecureTestEmail.php
similarity index 94%
rename from securemail/SecureTestEMail.php
rename to securemail/SecureTestEmail.php
index d7f9a2961..37fe5d7cd 100644
--- a/securemail/SecureTestEMail.php
+++ b/securemail/SecureTestEmail.php
@@ -6,12 +6,12 @@ use Friendica\App;
 use Friendica\App\BaseURL;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\PConfig\IPConfig;
-use Friendica\Object\EMail;
+use Friendica\Object\Email;
 
 /**
  * Class for creating a Test email for the securemail addon
  */
-class SecureTestEMail extends EMail
+class SecureTestEmail extends Email
 {
 	public function __construct(App $a, IConfig $config, IPConfig $pConfig, BaseURL $baseUrl)
 	{
diff --git a/securemail/securemail.php b/securemail/securemail.php
index e25e96695..55d032072 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -6,7 +6,7 @@
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  */
 
-use Friendica\Addon\securemail\SecureTestEMail;
+use Friendica\Addon\securemail\SecureTestEmail;
 use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -89,7 +89,7 @@ function securemail_settings_post(App &$a, array &$b)
 
 		if ($_POST['securemail-submit'] == DI::l10n()->t('Save and send test')) {
 
-			$res = DI::emailer()->send(new SecureTestEMail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));
+			$res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));
 
 			// revert to saved value
 			DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);