diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e6b489..a09b5f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Version 6.1.0
+
+## Features
+
+### PHP 8.4 Compatibility
+
+* Add PHP 8.4 support
+* Replace abandoned `swiftmailer/swiftmailer` with `symfony/mailer`
+
 # Version 6.0.0
 
 ### PHP 8.1 Compatibility
@@ -98,4 +107,4 @@
 
 ## Features
 
-* Initial Release
\ No newline at end of file
+* Initial Release
diff --git a/src/Logger/HandlerConfigurationInterface.php b/src/Logger/HandlerConfigurationInterface.php
index 622f66f..0b2edb3 100644
--- a/src/Logger/HandlerConfigurationInterface.php
+++ b/src/Logger/HandlerConfigurationInterface.php
@@ -14,6 +14,7 @@
 
 namespace TechDivision\Import\Configuration\Logger;
 
+use TechDivision\Import\Configuration\MailerConfigurationInterface;
 use TechDivision\Import\Configuration\ParamsConfigurationInterface;
 
 /**
@@ -43,9 +44,9 @@ public function getId();
     public function getFormatter();
 
     /**
-     * Return's the swift mailer configuration to use.
+     * Return's the mailer configuration to use.
      *
-     * @return \TechDivision\Import\Configuration\SwiftMailerConfigurationInterface The swift mailer configuration to use
+     * @return MailerConfigurationInterface The mailer configuration to use
      */
-    public function getSwiftMailer();
+    public function getMailer();
 }
diff --git a/src/SwiftMailer/MessageConfigurationInterface.php b/src/Mailer/MessageConfigurationInterface.php
similarity index 68%
rename from src/SwiftMailer/MessageConfigurationInterface.php
rename to src/Mailer/MessageConfigurationInterface.php
index 4dce565..bd894d8 100644
--- a/src/SwiftMailer/MessageConfigurationInterface.php
+++ b/src/Mailer/MessageConfigurationInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * TechDivision\Import\Configuration\SwiftMailer\MessageConfigurationInterface
+ * TechDivision\Import\Configuration\Mailer\MessageConfigurationInterface
  *
  * PHP version 7
  *
@@ -12,10 +12,10 @@
  * @link      http://www.techdivision.com
  */
 
-namespace TechDivision\Import\Configuration\SwiftMailer;
+namespace TechDivision\Import\Configuration\Mailer;
 
 /**
- * The swift mailer message configuration interface.
+ * The mailer message configuration interface.
  *
  * @author    Tim Wagner <t.wagner@techdivision.com>
  * @copyright 2020 TechDivision GmbH <info@techdivision.com>
@@ -25,11 +25,10 @@
  */
 interface MessageConfigurationInterface
 {
-
     /**
-     * Return's the swift mailer message factory used to create he instance.
+     * Return's the mailer message factory used to create the instance.
      *
-     * @return string The swift mailer message factory
+     * @return string The mailer message factory
      */
     public function getMessageFactory();
 }
diff --git a/src/SwiftMailer/TransportConfigurationInterface.php b/src/Mailer/TransportConfigurationInterface.php
similarity index 79%
rename from src/SwiftMailer/TransportConfigurationInterface.php
rename to src/Mailer/TransportConfigurationInterface.php
index 5724056..6db3d95 100644
--- a/src/SwiftMailer/TransportConfigurationInterface.php
+++ b/src/Mailer/TransportConfigurationInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * TechDivision\Import\Configuration\SwiftMailer\TransportConfigurationInterface
+ * TechDivision\Import\Configuration\Mailer\TransportConfigurationInterface
  *
  * PHP version 7
  *
@@ -12,12 +12,12 @@
  * @link      http://www.techdivision.com
  */
 
-namespace TechDivision\Import\Configuration\SwiftMailer;
+namespace TechDivision\Import\Configuration\Mailer;
 
 use TechDivision\Import\Configuration\ParamsConfigurationInterface;
 
 /**
- * The swift mailer transport configuration interface.
+ * The mailer transport configuration interface.
  *
  * @author    Tim Wagner <t.wagner@techdivision.com>
  * @copyright 2020 TechDivision GmbH <info@techdivision.com>
diff --git a/src/SwiftMailerConfigurationInterface.php b/src/MailerConfigurationInterface.php
similarity index 63%
rename from src/SwiftMailerConfigurationInterface.php
rename to src/MailerConfigurationInterface.php
index 0a0301d..8c336b2 100644
--- a/src/SwiftMailerConfigurationInterface.php
+++ b/src/MailerConfigurationInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * TechDivision\Import\Configuration\SwiftMailerConfigurationInterface
+ * TechDivision\Import\Configuration\MailerConfigurationInterface
  *
  * PHP version 7
  *
@@ -14,8 +14,10 @@
 
 namespace TechDivision\Import\Configuration;
 
+use TechDivision\Import\Configuration\Mailer\TransportConfigurationInterface;
+
 /**
- * The swift mailer configuration interface.
+ * The mailer configuration interface.
  *
  * @author    Tim Wagner <t.wagner@techdivision.com>
  * @copyright 2020 TechDivision GmbH <info@techdivision.com>
@@ -23,20 +25,20 @@
  * @link      https://github.com/techdivision/import-configuration
  * @link      http://www.techdivision.com
  */
-interface SwiftMailerConfigurationInterface extends ParamsConfigurationInterface
+interface MailerConfigurationInterface extends ParamsConfigurationInterface
 {
 
     /**
-     * Return's the DI ID used to create the swift mailer instance.
+     * Return's the DI ID used to create the mailer instance.
      *
      * @return string The DI ID
      */
     public function getId();
 
     /**
-     * Return's the swift mailer transport configuration to use.
+     * Return's the mailer transport configuration to use.
      *
-     * @return \TechDivision\Import\Configuration\SwiftMailer\TransportConfigurationInterface The transport configuration to use
+     * @return TransportConfigurationInterface The transport configuration to use
      */
     public function getTransport();
 }