diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DataCollector/MessageDataCollector.php b/src/Symfony/Bundle/SwiftmailerBundle/DataCollector/MessageDataCollector.php
index ceecc1c62a..1b192239b8 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/DataCollector/MessageDataCollector.php
+++ b/src/Symfony/Bundle/SwiftmailerBundle/DataCollector/MessageDataCollector.php
@@ -56,6 +56,6 @@ class MessageDataCollector extends DataCollector
      */
     public function getName()
     {
-        return 'message';
+        return 'swiftmailer';
     }
 }
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
index 08a83fa7be..faa183bbf2 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
+++ b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
@@ -102,7 +102,6 @@ class SwiftmailerExtension extends Extension
             $container->setParameter('swiftmailer.single_address', null);
         }
 
-
         if (isset($config['disable_delivery']) && $config['disable_delivery']) {
             $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.blackhole')));
         }
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
index 593083327d..2ed1498657 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
+++ b/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
@@ -69,7 +69,7 @@
     <service id="swiftmailer.plugin.messagelogger" class="%swiftmailer.plugin.messagelogger.class%" public="false" />
 
     <service id="swiftmailer.data_collector" class="%swiftmailer.data_collector.class%" public="false">
-        <tag name="data_collector" template="SwiftmailerBundle:Collector:message" id="message" />
+        <tag name="data_collector" template="SwiftmailerBundle:Collector:message" id="swiftmailer" />
         <argument type="service" id="swiftmailer.plugin.messagelogger" />
         <argument type="service" id="swiftmailer.mailer" />
     </service>
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/Resources/views/Collector/message.html.twig b/src/Symfony/Bundle/SwiftmailerBundle/Resources/views/Collector/swiftmailer.html.twig
similarity index 100%
rename from src/Symfony/Bundle/SwiftmailerBundle/Resources/views/Collector/message.html.twig
rename to src/Symfony/Bundle/SwiftmailerBundle/Resources/views/Collector/swiftmailer.html.twig