diff --git a/src/bin/upgrade_bulk_spool.pl.in b/src/bin/upgrade_bulk_spool.pl.in
index a8b9ceeda..976e1cded 100644
--- a/src/bin/upgrade_bulk_spool.pl.in
+++ b/src/bin/upgrade_bulk_spool.pl.in
@@ -9,8 +9,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,6 @@ use MIME::Base64 qw();
 use Pod::Usage;
 use POSIX qw();
 
-use Sympa::Bulk;
 use Conf;
 use Sympa::Constants;
 use Sympa::DatabaseManager;
@@ -43,6 +42,7 @@ use Sympa::List;
 use Sympa::Log;
 use Sympa::Message;
 use Sympa::Spool;
+use Sympa::Spool::Outgoing;
 
 my %options;
 unless (GetOptions(\%options, 'help|h', 'dry_run', 'version|v')) {
@@ -85,7 +85,7 @@ process();
 exit 0;
 
 sub process {
-    my $bulk = Sympa::Bulk->new;
+    my $bulk = Sympa::Spool::Outgoing->new;
 
     my $sdm = Sympa::DatabaseManager->instance
         or die 'Can\'t connect to database';
@@ -305,7 +305,9 @@ robot configuration parameters in C<robot.conf> are referred.
 
 =head1 SEE ALSO
 
-L<sympa.conf(5)>, L<Sympa::Bulk>, L<Sympa::Message>.
+L<sympa.conf(5)>,
+L<Sympa::Message>,
+L<Sympa::Spool::Outgoing>.
 
 =head1 HISTORY
 
diff --git a/src/bin/upgrade_send_spool.pl.in b/src/bin/upgrade_send_spool.pl.in
index bef52a94d..9bf422b7d 100644
--- a/src/bin/upgrade_send_spool.pl.in
+++ b/src/bin/upgrade_send_spool.pl.in
@@ -9,8 +9,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,12 +34,12 @@ use English qw(-no_match_vars);
 use Getopt::Long;
 use Pod::Usage;
 
-use Sympa::Bulk;
 use Sympa::Constants;
 use Conf;
 use Sympa::Log;
 use Sympa::Spool;
 use Sympa::Spool::Incoming;
+use Sympa::Spool::Outgoing;
 
 my %options;
 unless (GetOptions(\%options, 'help|h', 'dry_run', 'version|v')) {
@@ -73,7 +73,7 @@ unless (($GID == (getgrnam(Sympa::Constants::GROUP))[2])
 # Sets the UMASK
 umask oct $Conf::Conf{'umask'};
 
-my $bulk      = Sympa::Bulk->new;
+my $bulk      = Sympa::Spool::Outgoing->new;
 my $spool     = Sympa::Spool::Incoming->new;
 my $spool_dir = $spool->{directory};
 
diff --git a/src/cgi/sympa_soap_server.fcgi.in b/src/cgi/sympa_soap_server.fcgi.in
index 88b32a718..e40ad06a5 100644
--- a/src/cgi/sympa_soap_server.fcgi.in
+++ b/src/cgi/sympa_soap_server.fcgi.in
@@ -9,8 +9,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
-# top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,10 +34,10 @@ use SOAP::Lite;
 
 ## Sympa API
 use Conf;
-use Sympa::Alarm;
 use Sympa::DatabaseManager;
 use Sympa::List;
 use Sympa::Log;
+use Sympa::Spool::Listmaster;
 use Sympa::WWW::SOAP;
 use Sympa::WWW::SOAP::Transport;
 
@@ -71,7 +71,7 @@ unless (Sympa::DatabaseManager->instance) {
 
 ## The process should not fork for sending mail
 ## Messages will be spooled instead
-Sympa::Alarm->instance->{use_bulk} = 1;
+Sympa::Spool::Listmaster->instance->{use_bulk} = 1;
 
 ## Loading all Lists at startup, in order to increase execution speed
 
diff --git a/src/cgi/wwsympa.fcgi.in b/src/cgi/wwsympa.fcgi.in
index 04436b5a9..5bd747e57 100644
--- a/src/cgi/wwsympa.fcgi.in
+++ b/src/cgi/wwsympa.fcgi.in
@@ -54,9 +54,7 @@ use Data::Dumper;    # tentative
 BEGIN { eval 'use Crypt::OpenSSL::X509'; }
 
 use Sympa;
-use Sympa::Alarm;
 use Sympa::Archive;
-use Sympa::Bulk;
 use Conf;
 use Sympa::ConfDef;
 use Sympa::Constants;
@@ -80,7 +78,10 @@ use Sympa::Spool::Archive;
 use Sympa::Spool::Auth;
 use Sympa::Spool::Held;
 use Sympa::Spool::Incoming;
+use Sympa::Spool::Listmaster;
 use Sympa::Spool::Moderation;
+use Sympa::Spool::Outgoing;
+use Sympa::Spool::Topic;
 use Sympa::Task;
 use Sympa::Template;
 use Sympa::Ticket;
@@ -88,7 +89,6 @@ use Sympa::Tools::Data;
 use Sympa::Tools::File;
 use Sympa::Tools::Password;
 use Sympa::Tools::Text;
-use Sympa::Topic;
 use Sympa::Tracking;
 use Sympa::User;
 use Sympa::WWW::Auth;
@@ -131,7 +131,7 @@ $log->{level} = $Conf::Conf{'log_level'};
 $log->openlog($Conf::Conf{'log_facility'} || $Conf::Conf{'syslog'},
     $Conf::Conf{'log_socket_type'});
 
-Sympa::Alarm->instance->{use_bulk} = 1;
+Sympa::Spool::Listmaster->instance->{use_bulk} = 1;
 
 # hash of all the description files already loaded
 # format :
@@ -1035,7 +1035,7 @@ my $query;
 
 my $birthday = [stat $PROGRAM_NAME]->[9];
 
-my $bulk = Sympa::Bulk->new;
+my $bulk = Sympa::Spool::Outgoing->new;
 
 $log->syslog('info', 'WWSympa started, process %d', $PID);
 
@@ -1066,7 +1066,7 @@ while ($query = CGI::Fast->new) {
     $language->set_lang(Sympa::best_language('*'));
 
     # Process grouped notifications.
-    Sympa::Alarm->instance->flush;
+    Sympa::Spool::Listmaster->instance->flush;
 
     ## Check effective ID
     unless ($EUID eq (getpwnam(Sympa::Constants::USER))[2]) {
@@ -1828,7 +1828,7 @@ while ($query = CGI::Fast->new) {
 }
 
 # Purge grouped notifications
-Sympa::Alarm->instance->flush(purge => 1);
+Sympa::Spool::Listmaster->instance->flush(purge => 1);
 
 ##############################################################
 #-#\#|#/#-#\#|#/#-#\#|#/#-#\#|#/#-#\#|#/#-#\#|#/#-#\#|#/#-#\#|#/
@@ -7897,7 +7897,7 @@ sub do_distribute {
 
         # TAG
         if (@topics) {
-            Sympa::Topic->new(
+            Sympa::Spool::Topic->new(
                 topic  => join(',', @topics),
                 method => 'editor'
             )->store($message);
@@ -14929,8 +14929,10 @@ sub do_send_mail {
     if (@to_list and $in{'sub_action'} eq 'sendmailtolist') {
         # TAG
         if ($list_topics) {
-            Sympa::Topic->new(topic => $list_topics, method => 'sender')
-                ->store($message);
+            Sympa::Spool::Topic->new(
+                topic  => $list_topics,
+                method => 'sender'
+            )->store($message);
         }
 
         my $l_message = $message->dup;
@@ -15099,7 +15101,7 @@ sub do_tag_topic_by_sender {
     }
 
     # TAG
-    Sympa::Topic->new(topic => $list_topics, method => 'sender')
+    Sympa::Spool::Topic->new(topic => $list_topics, method => 'sender')
         ->store($message);
 
     ## CONFIRM
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 6c5a8ad48..d4a070347 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -30,13 +30,11 @@ nobase_dist_modules_DATA = \
 	Sympa/Internals/Workflow.pod
 nobase_modules_DATA = \
 	Sympa.pm \
-	Sympa/Alarm.pm \
 	Sympa/Aliases.pm \
 	Sympa/Aliases/CheckSMTP.pm \
 	Sympa/Aliases/External.pm \
 	Sympa/Aliases/Template.pm \
 	Sympa/Archive.pm \
-	Sympa/Bulk.pm \
 	Sympa/CommandDef.pm \
 	Conf.pm \
 	Sympa/ConfDef.pm \
@@ -147,7 +145,6 @@ nobase_modules_DATA = \
 	Sympa/Spindle/ProcessTask.pm \
 	Sympa/Spindle/ProcessTemplate.pm \
 	Sympa/Spindle/ResendArchive.pm \
-	Sympa/Spindle/ToAlarm.pm \
 	Sympa/Spindle/ToArchive.pm \
 	Sympa/Spindle/ToAuth.pm \
 	Sympa/Spindle/ToAuthOwner.pm \
@@ -155,6 +152,7 @@ nobase_modules_DATA = \
 	Sympa/Spindle/ToEditor.pm \
 	Sympa/Spindle/ToHeld.pm \
 	Sympa/Spindle/ToList.pm \
+	Sympa/Spindle/ToListmaster.pm \
 	Sympa/Spindle/ToMailer.pm \
 	Sympa/Spindle/ToModeration.pm \
 	Sympa/Spindle/ToOutgoing.pm \
@@ -170,8 +168,11 @@ nobase_modules_DATA = \
 	Sympa/Spool/Digest/Collection.pm \
 	Sympa/Spool/Held.pm \
 	Sympa/Spool/Incoming.pm \
+	Sympa/Spool/Listmaster.pm \
 	Sympa/Spool/Moderation.pm \
+	Sympa/Spool/Outgoing.pm \
 	Sympa/Spool/Task.pm \
+	Sympa/Spool/Topic.pm \
 	Sympa/Task.pm \
 	Sympa/Template.pm \
 	Sympa/Ticket.pm \
@@ -183,7 +184,6 @@ nobase_modules_DATA = \
 	Sympa/Tools/SMIME.pm \
 	Sympa/Tools/Text.pm \
 	Sympa/Tools/Time.pm \
-	Sympa/Topic.pm \
 	Sympa/Tracking.pm \
 	Sympa/Upgrade.pm \
 	Sympa/User.pm \
diff --git a/src/lib/Sympa.pm b/src/lib/Sympa.pm
index 67fd42bdd..ab47ffdbc 100644
--- a/src/lib/Sympa.pm
+++ b/src/lib/Sympa.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
-# top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -478,7 +478,7 @@ sub send_notify_to_listmaster {
             rcpt     => $email,
             data     => $ts->{'data'},
 
-            splicing_to => ['Sympa::Spindle::ToAlarm'],
+            splicing_to => ['Sympa::Spindle::ToListmaster'],
         );
         unless ($spindle
             and $spindle->spin
diff --git a/src/lib/Sympa/Crash.pm b/src/lib/Sympa/Crash.pm
index 1c557e3c0..54ed61e68 100644
--- a/src/lib/Sympa/Crash.pm
+++ b/src/lib/Sympa/Crash.pm
@@ -8,6 +8,9 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
+# Copyright 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
+# <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -98,7 +101,7 @@ sub _crash_handler {
     # Cleanup.
     # If any of corresponding modules have not been loaded, they are ignored.
     eval { Sympa::Log->instance->syslog('err', 'DIED: %s', $mess); };
-    eval { Sympa::Alarm->instance->flush(purge => 1); };
+    eval { Sympa::Spool::Listmaster->instance->flush(purge => 1); };
     eval { Sympa::DatabaseManager->disconnect(); };    # unlock database
     eval { Sys::Syslog::closelog(); };                 # flush log
     eval { Sympa::Log->instance->{level} = -1; };      # disable log
diff --git a/src/lib/Sympa/Internals/Workflow.pod b/src/lib/Sympa/Internals/Workflow.pod
index 900489b60..5f3de684b 100644
--- a/src/lib/Sympa/Internals/Workflow.pod
+++ b/src/lib/Sympa/Internals/Workflow.pod
@@ -46,8 +46,8 @@ workflow of Sympa.  For more details see documentation on each class.
                      +-> [DoMessage]          /
                                \             /---> [ToHeld] => Held
           *3 (CONFIRM)          +-> [AuthorizeMessage]
-          :                    /             \---> [ToModeration] => Mod.
-          v                   /               \
+          :                    /      :      \---> [ToModeration] => Mod.
+          v                   /     Topic     \
  Held => [ProcessHeld] ------+                 \
                                                 +-> [DistributeMessage]
             *3 (DISTRIBUTE)                    /           \
@@ -61,22 +61,24 @@ workflow of Sympa.  For more details see documentation on each class.
                        +-------------------------------------------+
                         \
                         [TransformIncoming]
- <<wwsympa.fcgi>>         \
+                          \        :
+                           \     Topic
+ <<wwsympa.fcgi>>           \
                         [ToArchive] => Archive
- (list archive)             \
+ (list archive)               \
   => [ResendArchive] -- [TransformOutgoing] -+
-                              \               \
+                                \             \
                         [ToDigest] => Digest   \
-                                \               \
-                                 +---------------+-> [ToList] => Outgoing
- 
-                            +-> [TransformDigestFinal]  
-                           /                     \
- <<Template sending>>     /         +----------> [ToOutgoing] => Outgoing 
+                                  \             \
+                                   +-------------+-> [ToList] => Outgoing
+                                                           :
+                            +-> [TransformDigestFinal]    Topic
+                           /                 \
+ <<Template sending>>     /         +------> [ToOutgoing] => Outgoing
                          /         / 
- (mail template) => [ProcessTemplate] ---------> [ToAlarm] => Alarm
+ (mail template) => [ProcessTemplate] -----> [ToListmaster] => Listmaster
                        /           \
-                       ^            +----------> [ToMailer] => (Mailer)
+                       ^            +------> [ToMailer] => (Mailer)
                        |
                        *1
 
@@ -116,14 +118,9 @@ Spool class.  Prefix C<Sympa::Spool::> is omitted.
 
 =over
 
-=item C<Alarm>
-
-=item C<Outgoing>
-
 =item C<Tracking>
 
-L<Sympa::Alarm>, L<Sympa::Bulk> and L<Sympa::Tracking> classes
-(they are named such by historical reason).
+L<Sympa::Tracking> class
 
 =back
 
diff --git a/src/lib/Sympa/List.pm b/src/lib/Sympa/List.pm
index 55e2815b2..e6df42e7d 100644
--- a/src/lib/Sympa/List.pm
+++ b/src/lib/Sympa/List.pm
@@ -6467,16 +6467,16 @@ sub is_msg_topic_tagging_required {
 }
 
 # DEPRECATED.
-# Use Sympa::Message::compute_topic() and Sympa::Topic::store() instead.
+# Use Sympa::Message::compute_topic() and Sympa::Spool::Topic::store() instead.
 #sub automatic_tag;
 
 # Moved to Sympa::Message::compute_topic().
 #sub compute_topic;
 
-# DEPRECATED.  Use Sympa::Topic::store() instead.
+# DEPRECATED.  Use Sympa::Spool::Topic::store() instead.
 #sub tag_topic;
 
-# DEPRECATED.  Use Sympa::Topic::load() instead.
+# DEPRECATED.  Use Sympa::Spool::Topic::load() instead.
 #sub load_msg_topic_file;
 
 # Moved to _notify_deleted_topic() in wwsympa.fcgi.
diff --git a/src/lib/Sympa/Mailer.pm b/src/lib/Sympa/Mailer.pm
index 723d155d1..d009305ed 100644
--- a/src/lib/Sympa/Mailer.pm
+++ b/src/lib/Sympa/Mailer.pm
@@ -73,7 +73,7 @@ sub _new_instance {
 #DEPRECATED.
 #sub sendto;
 
-# DEPRECATED.  Use Sympa::Mailer::store() or Sympa::Bulk::store().
+# DEPRECATED.  Use Sympa::Mailer::store() or Sympa::Spool::Outgoing::store().
 # Old name:
 # mail::sending(), Sympa::Mail::sending(), Sympa::Mailer::send_message().
 #sub send_message ($self, $message, $rcpt, %params);
@@ -377,7 +377,8 @@ If set, maximum number of invocation of sendmail is divided by this value.
 
 =head1 SEE ALSO
 
-L<Sympa::Alarm>, L<Sympa::Bulk>, L<Sympa::Message>, L<Sympa::Process>.
+L<Sympa::Message>, L<Sympa::Process>,
+L<Sympa::Spool::Listmaster>, L<Sympa::Spool::Outgoing>.
 
 =head1 HISTORY
 
diff --git a/src/lib/Sympa/Request/Handler/move_list.pm b/src/lib/Sympa/Request/Handler/move_list.pm
index 7ff10e208..f21c2cb1e 100644
--- a/src/lib/Sympa/Request/Handler/move_list.pm
+++ b/src/lib/Sympa/Request/Handler/move_list.pm
@@ -4,8 +4,8 @@
 
 # Sympa - SYsteme de Multi-Postage Automatique
 #
-# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
-# top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,6 @@ use File::Copy qw();
 
 use Sympa;
 use Sympa::Aliases;
-use Sympa::Bulk;
 use Conf;
 use Sympa::DatabaseManager;
 use Sympa::List;
@@ -43,6 +42,7 @@ use Sympa::Spool::Digest::Collection;
 use Sympa::Spool::Held;
 use Sympa::Spool::Incoming;
 use Sympa::Spool::Moderation;
+use Sympa::Spool::Outgoing;
 use Sympa::Spool::Task;
 use Sympa::Tools::File;
 
@@ -346,7 +346,7 @@ sub _move {
 
     # Rename files in outgoing spool.
     # Continue even if there are some troubles.
-    my $spool = Sympa::Bulk->new(context => $current_list);
+    my $spool = Sympa::Spool::Outgoing->new(context => $current_list);
     while (1) {
         my ($message, $handle) = $spool->next(no_filter => 1);
         last unless $handle;
diff --git a/src/lib/Sympa/Robot.pm b/src/lib/Sympa/Robot.pm
index 748e34591..abddb5d99 100644
--- a/src/lib/Sympa/Robot.pm
+++ b/src/lib/Sympa/Robot.pm
@@ -56,7 +56,8 @@ our %listmaster_messages_stack;
 # Sympa::Mailer::send_message().
 # sub send_global_file($tpl, $who, $robot, $context, $options);
 
-# MOVED: Use Sympa::send_notify_to_listmaster() or Sympa::Alarm::flush().
+# MOVED: Use Sympa::send_notify_to_listmaster() or
+# Sympa::Spool::Listmaster::flush().
 # sub send_notify_to_listmaster($operation, $robot, $data, $checkstack, $purge);
 
 ## Is the user listmaster
diff --git a/src/lib/Sympa/Spindle/AuthorizeMessage.pm b/src/lib/Sympa/Spindle/AuthorizeMessage.pm
index 6388e44e4..7a82c653c 100644
--- a/src/lib/Sympa/Spindle/AuthorizeMessage.pm
+++ b/src/lib/Sympa/Spindle/AuthorizeMessage.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2018 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,8 +34,8 @@ use Sympa;
 use Sympa::List;
 use Sympa::Log;
 use Sympa::Scenario;
+use Sympa::Spool::Topic;
 use Sympa::Tools::Data;
-use Sympa::Topic;
 
 use base qw(Sympa::Spindle);
 
@@ -62,18 +62,23 @@ sub _twist {
         and $list->is_there_msg_topic
     ) {
         my $topic;
-        if ($topic = Sympa::Topic->load($message)) {
+        if ($topic = Sympa::Spool::Topic->load($message)) {
             # Is message already tagged?
             ;
-        } elsif ($topic = Sympa::Topic->load($message, in_reply_to => 1)) {
+        } elsif ($topic =
+            Sympa::Spool::Topic->load($message, in_reply_to => 1)) {
             # Is message in-reply-to already tagged?
-            $topic =
-                Sympa::Topic->new(topic => $topic->{topic}, method => 'auto');
+            $topic = Sympa::Spool::Topic->new(
+                topic  => $topic->{topic},
+                method => 'auto'
+            );
             $topic->store($message);
         } elsif (my $topic_list = $message->compute_topic) {
             # Not already tagged.
-            $topic =
-                Sympa::Topic->new(topic => $topic_list, method => 'auto');
+            $topic = Sympa::Spool::Topic->new(
+                topic  => $topic_list,
+                method => 'auto'
+            );
             $topic->store($message);
         }
 
@@ -421,7 +426,7 @@ L<Sympa::Message>, L<Sympa::Scenario>, L<Sympa::Spindle::DistributeMessage>,
 L<Sympa::Spindle::DoMessage>, L<Sympa::Spindle::ProcessHeld>,
 L<Sympa::Spindle::ToEditor>, L<Sympa::Spindle::ToHeld>,
 L<Sympa::Spindle::ToModeration>,
-L<Sympa::Topic>.
+L<Sympa::Spool::Topic>.
 
 =head1 HISTORY
 
diff --git a/src/lib/Sympa/Spindle/ProcessArchive.pm b/src/lib/Sympa/Spindle/ProcessArchive.pm
index 46b686d28..3afb329ed 100644
--- a/src/lib/Sympa/Spindle/ProcessArchive.pm
+++ b/src/lib/Sympa/Spindle/ProcessArchive.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -33,12 +33,12 @@ use English qw(-no_match_vars);
 use POSIX qw();
 
 use Sympa;
-use Sympa::Alarm;
 use Sympa::Archive;
 use Conf;
 use Sympa::List;
 use Sympa::Log;
 use Sympa::Process;
+use Sympa::Spool::Listmaster;
 use Sympa::Tools::File;
 
 use base qw(Sympa::Spindle);
@@ -53,7 +53,7 @@ sub _init {
 
     if ($state == 1) {
         # Process grouped notifications.
-        Sympa::Alarm->instance->flush;
+        Sympa::Spool::Listmaster->instance->flush;
     }
 
     1;
diff --git a/src/lib/Sympa/Spindle/ProcessAutomatic.pm b/src/lib/Sympa/Spindle/ProcessAutomatic.pm
index 4e26ec2c4..3ab2dd313 100644
--- a/src/lib/Sympa/Spindle/ProcessAutomatic.pm
+++ b/src/lib/Sympa/Spindle/ProcessAutomatic.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,6 @@ use English qw(-no_match_vars);
 use File::Copy qw();
 
 use Sympa;
-use Sympa::Alarm;
 use Conf;
 use Sympa::Family;
 use Sympa::List;
@@ -41,6 +40,7 @@ use Sympa::Log;
 use Sympa::Mailer;
 use Sympa::Spindle::ProcessRequest;
 use Sympa::Spool::Incoming;
+use Sympa::Spool::Listmaster;
 use Sympa::Tools::Data;
 
 use base qw(Sympa::Spindle);
@@ -55,7 +55,7 @@ sub _init {
 
     if ($state == 1) {
         # Process grouped notifications.
-        Sympa::Alarm->instance->flush;
+        Sympa::Spool::Listmaster->instance->flush;
     }
 
     1;
diff --git a/src/lib/Sympa/Spindle/ProcessBounce.pm b/src/lib/Sympa/Spindle/ProcessBounce.pm
index 5ae7743c3..d4d9fefe2 100644
--- a/src/lib/Sympa/Spindle/ProcessBounce.pm
+++ b/src/lib/Sympa/Spindle/ProcessBounce.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -37,13 +37,13 @@ use MIME::Head;
 use MIME::Parser;
 
 use Sympa;
-use Sympa::Alarm;
 use Conf;
 use Sympa::List;
 use Sympa::Log;
 use Sympa::Process;
 use Sympa::Regexps;
 use Sympa::Scenario;
+use Sympa::Spool::Listmaster;
 use Sympa::Tools::Data;
 use Sympa::Tools::Text;
 use Sympa::Tracking;
@@ -60,7 +60,7 @@ sub _init {
 
     if ($state == 1) {
         # Process grouped notifications.
-        Sympa::Alarm->instance->flush;
+        Sympa::Spool::Listmaster->instance->flush;
     }
 
     1;
diff --git a/src/lib/Sympa/Spindle/ProcessIncoming.pm b/src/lib/Sympa/Spindle/ProcessIncoming.pm
index 3ab48bb8d..1d3e3646a 100644
--- a/src/lib/Sympa/Spindle/ProcessIncoming.pm
+++ b/src/lib/Sympa/Spindle/ProcessIncoming.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -32,13 +32,13 @@ use warnings;
 use File::Copy qw();
 
 use Sympa;
-use Sympa::Alarm;
 use Conf;
 use Sympa::Language;
 use Sympa::List;
 use Sympa::Log;
 use Sympa::Mailer;
 use Sympa::Process;
+use Sympa::Spool::Listmaster;
 use Sympa::Tools::Data;
 
 use base qw(Sympa::Spindle);
@@ -59,7 +59,7 @@ sub _init {
         $self->{_msgid_cleanup} = time;
     } elsif ($state == 1) {
         # Process grouped notifications.
-        Sympa::Alarm->instance->flush;
+        Sympa::Spool::Listmaster->instance->flush;
 
         # Cleanup in-memory msgid table, only in a while.
         if (time > $self->{_msgid_cleanup} +
diff --git a/src/lib/Sympa/Spindle/ProcessOutgoing.pm b/src/lib/Sympa/Spindle/ProcessOutgoing.pm
index 9d79ff218..9b5557f2f 100644
--- a/src/lib/Sympa/Spindle/ProcessOutgoing.pm
+++ b/src/lib/Sympa/Spindle/ProcessOutgoing.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,6 @@ use warnings;
 use English qw(-no_match_vars);
 
 use Sympa;
-use Sympa::Alarm;
 use Conf;
 use Sympa::DatabaseManager;
 use Sympa::List;
@@ -40,6 +39,7 @@ use Sympa::Log;
 use Sympa::Mailer;
 use Sympa::Message::Template;
 use Sympa::Process;
+use Sympa::Spool::Listmaster;
 use Sympa::Tools::Data;
 use Sympa::Tools::DKIM;
 use Sympa::Tracking;
@@ -50,7 +50,7 @@ my $log     = Sympa::Log->instance;
 my $mailer  = Sympa::Mailer->instance;
 my $process = Sympa::Process->instance;
 
-use constant _distaff => 'Sympa::Bulk';
+use constant _distaff => 'Sympa::Spool::Outgoing';
 
 sub _init {
     my $self  = shift;
@@ -71,7 +71,7 @@ sub _init {
             : $Conf::Conf{'log_level'};
 
         # Process grouped notifications.
-        Sympa::Alarm->instance->flush;
+        Sympa::Spool::Listmaster->instance->flush;
 
         unless ($process->{detached}) {
             ;
@@ -528,13 +528,14 @@ See also L<Sympa::Spindle/"Properties">.
 
 =item {distaff}
 
-Instance of L<Sympa::Bulk> class.
+Instance of L<Sympa::Spool::Outgoing> class.
 
 =back
 
 =head1 SEE ALSO
 
-L<Sympa::Bulk>, L<Sympa::Mailer>, L<Sympa::Message>, L<Sympa::Spindle>.
+L<Sympa::Mailer>, L<Sympa::Message>, L<Sympa::Spindle>,
+L<Sympa::Spool::Outgoing>.
 
 =head1 HISTORY
 
diff --git a/src/lib/Sympa/Spindle/ProcessTask.pm b/src/lib/Sympa/Spindle/ProcessTask.pm
index ffb45081c..5bc4bf22d 100644
--- a/src/lib/Sympa/Spindle/ProcessTask.pm
+++ b/src/lib/Sympa/Spindle/ProcessTask.pm
@@ -28,13 +28,13 @@ use warnings;
 use English qw(-no_match_vars);
 
 use Sympa;
-use Sympa::Alarm;
 use Conf;
 use Sympa::DatabaseManager;
 use Sympa::List;
 use Sympa::Log;
 use Sympa::Scenario;
 use Sympa::Spool;
+use Sympa::Spool::Listmaster;
 use Sympa::Task;
 use Sympa::Ticket;
 use Sympa::Tools::File;
@@ -55,7 +55,7 @@ sub _init {
 
     if ($state == 1) {
         # Process grouped notifications.
-        Sympa::Alarm->instance->flush;
+        Sympa::Spool::Listmaster->instance->flush;
     }
 
     1;
diff --git a/src/lib/Sympa/Spindle/ProcessTemplate.pm b/src/lib/Sympa/Spindle/ProcessTemplate.pm
index a6a3adc5e..89023098d 100644
--- a/src/lib/Sympa/Spindle/ProcessTemplate.pm
+++ b/src/lib/Sympa/Spindle/ProcessTemplate.pm
@@ -147,7 +147,7 @@ C<'failure'> is set if processing failed.
 
 L<Sympa::Message::Template>,
 L<Sympa::Spindle>,
-L<Sympa::Spindle::ToAlarm>, L<Sympa::Spindle::ToMailer>,
+L<Sympa::Spindle::ToListmaster>, L<Sympa::Spindle::ToMailer>,
 L<Sympa::Spindle::ToOutgoing>.
 
 =head1 HISTORY
diff --git a/src/lib/Sympa/Spindle/ToList.pm b/src/lib/Sympa/Spindle/ToList.pm
index 7e68e3b48..6022fd2d3 100644
--- a/src/lib/Sympa/Spindle/ToList.pm
+++ b/src/lib/Sympa/Spindle/ToList.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
-# top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -32,11 +32,11 @@ use warnings;
 use Time::HiRes qw();
 
 use Sympa;
-use Sympa::Bulk;
 use Conf;
 use Sympa::Log;
+use Sympa::Spool::Outgoing;
+use Sympa::Spool::Topic;
 use Sympa::Tools::Data;
-use Sympa::Topic;
 use Sympa::Tracking;
 
 use base qw(Sympa::Spindle);
@@ -274,7 +274,7 @@ sub _send_msg {
         if (not $resent_by    # Not in ResendArchive spindle.
             and $list->is_there_msg_topic
         ) {
-            my $topic = Sympa::Topic->load($message);
+            my $topic = Sympa::Spool::Topic->load($message);
             my $topic_list = $topic ? $topic->{topic} : '';
 
             @selected_tabrcpt =
@@ -418,7 +418,7 @@ sub _mail_message {
     # Overwrite original envelope sender.  It is REQUIRED for delivery.
     $message->{envelope_sender} = Sympa::get_address($list, 'return_path');
 
-    return Sympa::Bulk->new->store($message, $rcpt, tag => $tag)
+    return Sympa::Spool::Outgoing->new->store($message, $rcpt, tag => $tag)
         || undef;
 }
 
@@ -442,7 +442,7 @@ Transformation processes by this class are done in the following order:
 =item *
 
 Classifies recipients for whom message is delivered by each reception mode,
-filters recipients by topics (see also L<Sympa::Topic>), and choose
+filters recipients by topics (see also L<Sympa::Spool::Topic>), and choose
 message tracking modes if necessary.
 
 =item *
@@ -465,7 +465,7 @@ Alters envelope sender of the message to I<list>C<-owner> address.
 
 =back
 
-Then stores message into outgoing spool (see L<Sympa::Bulk>)
+Then stores message into outgoing spool (see L<Sympa::Spool::Outgoing>)
 with classified packets of recipients.
 
 This cass updates statistics information of the list (with digest delivery,
@@ -476,10 +476,10 @@ L<Sympa::Spindle::ToOutgoing> will update it).
 
 L<Sympa::Internals::Workflow>.
 
-L<Sympa::Bulk>,
 L<Sympa::Message>,
 L<Sympa::Spindle>, L<Sympa::Spindle::DistributeMessage>,
-L<Sympa::Topic>, L<Sympa::Tracking>.
+L<Sympa::Spool::Outgoing>,
+L<Sympa::Spool::Topic>, L<Sympa::Tracking>.
 
 =head1 HISTORY
 
diff --git a/src/lib/Sympa/Spindle/ToAlarm.pm b/src/lib/Sympa/Spindle/ToListmaster.pm
similarity index 70%
rename from src/lib/Sympa/Spindle/ToAlarm.pm
rename to src/lib/Sympa/Spindle/ToListmaster.pm
index 7ce18cee2..efa126deb 100644
--- a/src/lib/Sympa/Spindle/ToAlarm.pm
+++ b/src/lib/Sympa/Spindle/ToListmaster.pm
@@ -4,10 +4,9 @@
 
 # Sympa - SYsteme de Multi-Postage Automatique
 #
-# Copyright (c) 1997, 1998, 1999 Institut Pasteur & Christophe Wolfhugel
-# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
-# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
+# Copyright 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
+# <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,12 +21,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package Sympa::Spindle::ToAlarm;
+package Sympa::Spindle::ToListmaster;
 
 use strict;
 use warnings;
 
-use Sympa::Alarm;
+use Sympa::Spool::Listmaster;
 
 use base qw(Sympa::Spindle);
 
@@ -35,8 +34,8 @@ sub _twist {
     my $self    = shift;
     my $message = shift;
 
-    return Sympa::Alarm->instance->store($message, $message->{rcpt},
-        operation => $self->{data}{type}) ? 1 : undef;
+    return Sympa::Spool::Listmaster->instance->store($message,
+        $message->{rcpt}, operation => $self->{data}{type}) ? 1 : undef;
 }
 
 1;
@@ -46,7 +45,7 @@ __END__
 
 =head1 NAME
 
-Sympa::Spindle::ToAlarm -
+Sympa::Spindle::ToListmaster -
 Process to store messages into spool on memory for listmaster notification
 
 =head1 DESCRIPTION
@@ -57,10 +56,11 @@ TBD.
 
 L<Sympa::Message>,
 L<Sympa::Spindle>, L<Sympa::Spindle::ProcessTemplate>,
-L<Sympa::Alarm>.
+L<Sympa::Spool::Listmaster>.
 
 =head1 HISTORY
 
 L<Sympa::Spindle::ToAlarm> appeared on Sympa 6.2.13.
+It was renamed to L<Sympa::Spindle::ToListmaster> on Sympa 6.2.45b.3.
 
 =cut
diff --git a/src/lib/Sympa/Spindle/ToOutgoing.pm b/src/lib/Sympa/Spindle/ToOutgoing.pm
index a62408069..dda7cddae 100644
--- a/src/lib/Sympa/Spindle/ToOutgoing.pm
+++ b/src/lib/Sympa/Spindle/ToOutgoing.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
-# top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@ package Sympa::Spindle::ToOutgoing;
 use strict;
 use warnings;
 
-use Sympa::Bulk;
+use Sympa::Spool::Outgoing;
 
 use base qw(Sympa::Spindle);
 
@@ -39,7 +39,7 @@ sub _twist {
     my $message = shift;
 
     my $status =
-        Sympa::Bulk->new->store($message, $message->{rcpt},
+        Sympa::Spool::Outgoing->new->store($message, $message->{rcpt},
         tag => $message->{tag});
 
     if (    $status
@@ -78,7 +78,7 @@ L<Sympa::Spindle::ToList> will update it).
 
 L<Sympa::Message>,
 L<Sympa::Spindle>,
-L<Sympa::Bulk>.
+L<Sympa::Spool::Outgoing>.
 
 =head1 HISTORY
 
diff --git a/src/lib/Sympa/Spindle/TransformIncoming.pm b/src/lib/Sympa/Spindle/TransformIncoming.pm
index 97b34bf99..c5122932e 100644
--- a/src/lib/Sympa/Spindle/TransformIncoming.pm
+++ b/src/lib/Sympa/Spindle/TransformIncoming.pm
@@ -8,8 +8,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
-# top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -38,9 +38,9 @@ use Sympa::Language;
 use Sympa::Log;
 use Sympa::Message::Plugin;
 use Sympa::Regexps;
+use Sympa::Spool::Topic;
 use Sympa::Template;
 use Sympa::Tools::Data;
-use Sympa::Topic;
 
 use base qw(Sympa::Spindle);
 
@@ -64,7 +64,7 @@ sub _twist {
     ## Loading info msg_topic file if exists, add X-Sympa-Topic
     my $topic;
     if ($list->is_there_msg_topic) {
-        $topic = Sympa::Topic->load($message);
+        $topic = Sympa::Spool::Topic->load($message);
     }
     if ($topic) {
         # Add X-Sympa-Topic: header.
@@ -262,7 +262,7 @@ if available.
 =item *
 
 Adds C<X-Sympa-Topic> header field, if any message topics
-(see L<Sympa::Topic>) are tagged for the message.
+(see L<Sympa::Spool::Topic>) are tagged for the message.
 
 =item *
 
@@ -309,7 +309,7 @@ L<Sympa::Message>,
 L<Sympa::Message::Plugin>,
 L<Sympa::Spindle>,
 L<Sympa::Spindle::DistributeMessage>,
-L<Sympa::Topic>,
+L<Sympa::Spool::Topic>,
 L<Sympa::Tracking>.
 
 =head1 HISTORY
diff --git a/src/lib/Sympa/Alarm.pm b/src/lib/Sympa/Spool/Listmaster.pm
similarity index 85%
rename from src/lib/Sympa/Alarm.pm
rename to src/lib/Sympa/Spool/Listmaster.pm
index 4f6f399cb..ab1c7a99f 100644
--- a/src/lib/Sympa/Alarm.pm
+++ b/src/lib/Sympa/Spool/Listmaster.pm
@@ -4,10 +4,9 @@
 
 # Sympa - SYsteme de Multi-Postage Automatique
 #
-# Copyright (c) 1997, 1998, 1999 Institut Pasteur & Christophe Wolfhugel
-# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
-# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
+# Copyright 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
+# <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,17 +21,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package Sympa::Alarm;
+package Sympa::Spool::Listmaster;
 
 use strict;
 use warnings;
 
 use Sympa;
-use Sympa::Bulk;
 use Conf;
 use Sympa::Log;
 use Sympa::Mailer;
 use Sympa::Message::Template;
+use Sympa::Spool::Outgoing;
 
 use base qw(Class::Singleton);
 
@@ -55,7 +54,9 @@ sub store {
     my %options = @_;
 
     my $mailer =
-        $self->{use_bulk} ? Sympa::Bulk->new : Sympa::Mailer->instance;
+        $self->{use_bulk}
+        ? Sympa::Spool::Outgoing->new
+        : Sympa::Mailer->instance;
     my $operation = $options{operation};
 
     my $robot_id;
@@ -101,7 +102,9 @@ sub flush {
     my %options = @_;
 
     my $mailer =
-        $self->{use_bulk} ? Sympa::Bulk->new : Sympa::Mailer->instance;
+        $self->{use_bulk}
+        ? Sympa::Spool::Outgoing->new
+        : Sympa::Mailer->instance;
     my $purge = $options{purge};
 
     foreach my $robot_id (keys %{$self->{_stack}}) {
@@ -185,12 +188,12 @@ __END__
 
 =head1 NAME
 
-Sympa::Alarm - Spool on memory for listmaster notification
+Sympa::Spool::Listmaster - Spool on memory for listmaster notification
 
 =head1 SYNOPSIS
 
-    use Sympa::Alarm;
-    my $alarm = Sympa::Alarm->instance;
+    use Sympa::Spool::Listmaster;
+    my $alarm = Sympa::Spool::Listmaster->instance;
 
     $alarm->store($message, $rcpt, $operation);
 
@@ -199,7 +202,8 @@ Sympa::Alarm - Spool on memory for listmaster notification
 
 =head1 DESCRIPTION
 
-L<Sympa::Alarm> implements on-memory spool for listmaster notification.
+L<Sympa::Spool::Listmaster> implements on-memory spool for
+listmaster notification.
 
 =head2 Methods
 
@@ -208,11 +212,14 @@ L<Sympa::Alarm> implements on-memory spool for listmaster notification.
 =item instance ( )
 
 I<Constructor>.
-Creates a singleton instance of L<Sympa::Alarm> object.
+Creates a singleton instance of L<Sympa::Spool::Listmaster> object.
+
+I<Note>:
+Unlike the other spool classes, the instance of this class is singleton.
 
 Returns:
 
-A new L<Sympa::Alarm> instance, or undef for failure.
+A new L<Sympa::Spool::Listmaster> instance, or undef for failure.
 
 =item store ( $message, $rcpt, operation => $operation )
 
@@ -253,7 +260,7 @@ sent.
 
 =head2 Attribute
 
-The instance of L<Sympa::Alarm> has following attribute.
+The instance of L<Sympa::Spool::Listmaster> has following attribute.
 
 =over
 
@@ -266,10 +273,15 @@ Default is false.
 
 =back
 
+=head1 CAVEAT
+
+L<Sympa::Spool::Listmaster> is not a real subsclass of L<Sympa::Spool>.
+
 =head1 HISTORY
 
 Feature to compile notification to listmaster in group appeared on Sympa 6.2.
 
 L<Sympa::Alarm> appeared on Sympa 6.2.
+It was renamed to L<Sympa::Spool::Listmaster> on Sympa 6.2.45b.3.
 
 =cut
diff --git a/src/lib/Sympa/Bulk.pm b/src/lib/Sympa/Spool/Outgoing.pm
similarity index 94%
rename from src/lib/Sympa/Bulk.pm
rename to src/lib/Sympa/Spool/Outgoing.pm
index 6286088ff..78d4ef334 100644
--- a/src/lib/Sympa/Bulk.pm
+++ b/src/lib/Sympa/Spool/Outgoing.pm
@@ -4,12 +4,8 @@
 
 # Sympa - SYsteme de Multi-Postage Automatique
 #
-# Copyright (c) 1997, 1998, 1999 Institut Pasteur & Christophe Wolfhugel
-# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
-# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -25,7 +21,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package Sympa::Bulk;
+package Sympa::Spool::Outgoing;
 
 use strict;
 use warnings;
@@ -418,12 +414,12 @@ __END__
 
 =head1 NAME
 
-Sympa::Bulk - Spool for bulk sending
+Sympa::Spool::Outgoing - Spool for outgoing messages
 
 =head1 SYNOPSIS
 
-  use Sympa::Bulk;
-  my $bulk = Sympa::Bulk->new;
+  use Sympa::Spool::Outgoing;
+  my $bulk = Sympa::Spool::Outgoing->new;
 
   $bulk->store($message, ['user@dom.ain', 'user@other.dom.ain']);
 
@@ -431,7 +427,7 @@ Sympa::Bulk - Spool for bulk sending
 
 =head1 DESCRIPTION
 
-L<Sympa::Bulk> implements the spool for bulk sending.
+L<Sympa::Spool::Outgoing> implements the spool for outgoing messages.
 
 =head2 Methods
 
@@ -440,7 +436,7 @@ L<Sympa::Bulk> implements the spool for bulk sending.
 =item new ( )
 
 I<Constructor>.
-Creates new instance of L<Sympa::Bulk>.
+Creates new instance of L<Sympa::Spool::Outgoing>.
 
 =item next ( [ no_filter =E<gt> 1 ] )
 
@@ -570,6 +566,31 @@ the value of the C<bulk_fork_threshold> config parameter.
 
 =back
 
+=head1 CONFIGURATION PARAMETERS
+
+Following site configuration parameters in sympa.conf will be referred.
+
+=over
+
+=item queuebulk
+
+Directory path of outgoing spool.
+
+Note:
+Named such by historical reason.
+Don't confuse with C<queueoutgoing> for archive spool
+(see L<Sympa::Spool::Archive>).
+
+=item umask
+
+The umask to make directory.
+
+=back
+
+=head1 CAVEAT
+
+L<Sympa::Spool::Outgoing> is not a real subsclass of L<Sympa::Spool>.
+
 =head1 SEE ALSO
 
 L<bulk(8)>, L<Sympa::Mailer>, L<Sympa::Message>.
@@ -583,5 +604,6 @@ Support for DKIM signing was added on Sympa 6.1.
 
 Rewritten L<Sympa::Bulk> appeared on Sympa 6.2, using spools based on
 filesystem.
+It was renamed to L<Sympa::Spool::Outgoing> on Sympa 6.2.45b.3.
 
 =cut
diff --git a/src/lib/Sympa/Topic.pm b/src/lib/Sympa/Spool/Topic.pm
similarity index 89%
rename from src/lib/Sympa/Topic.pm
rename to src/lib/Sympa/Spool/Topic.pm
index 93761a0a3..453091c52 100644
--- a/src/lib/Sympa/Topic.pm
+++ b/src/lib/Sympa/Spool/Topic.pm
@@ -4,10 +4,9 @@
 
 # Sympa - SYsteme de Multi-Postage Automatique
 #
-# Copyright (c) 1997, 1998, 1999 Institut Pasteur & Christophe Wolfhugel
-# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
-# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
+# Copyright 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
+# <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +21,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package Sympa::Topic;
+package Sympa::Spool::Topic;
 
 use strict;
 use warnings;
@@ -173,16 +172,16 @@ __END__
 
 =head1 NAME
 
-Sympa::Topic - Message topic
+Sympa::Spool::Topic - Message topic
 
 =head1 SYNOPSIS
 
-  use Sympa::Topic;
+  use Sympa::Spool::Topic;
   
-  $topic = Sympa::Topic->new(topic => $topics, method => 'auto');
+  $topic = Sympa::Spool::Topic->new(topic => $topics, method => 'auto');
   $topic->store($message);
   
-  $topic = Sympa::Topic->load($message);
+  $topic = Sympa::Spool::Topic->load($message);
 
 =head1 DESCRIPTION
 
@@ -195,7 +194,7 @@ TBD.
 =item new ( options... )
 
 I<Constructor>.
-Creates new instance of L<Sympa::Topic>.
+Creates new instance of L<Sympa::Spool::Topic>.
 
 =item load ( $message, [ in_reply_to =E<gt> 1 ] )
 
@@ -220,7 +219,7 @@ Use value of C<In-Reply-To:> field instead of message ID.
 
 Returns:
 
-Instance of L<Sympa::Topic> or, if topic was not found, C<undef>.
+Instance of L<Sympa::Spool::Topic> or, if topic was not found, C<undef>.
 
 =item store ( $message )
 
@@ -260,10 +259,15 @@ The umask to make directory.
 
 =back
 
+=head1 CAVEAT
+
+L<Sympa::Spool::Topic> is not a real subsclass of L<Sympa::Spool>.
+
 =head1 HISTORY
 
 Feature to handle message topics was introduced on Sympa 5.2b.
 
 L<Sympa::Topic> module appeared on Sympa 6.2.10.
+It was renamed to L<Sympa::Spool::Topic> on Sympa 6.2.45b.3.
 
 =cut
diff --git a/src/lib/Sympa/WWW/Auth.pm b/src/lib/Sympa/WWW/Auth.pm
index 05ac48eba..0fc5452e9 100644
--- a/src/lib/Sympa/WWW/Auth.pm
+++ b/src/lib/Sympa/WWW/Auth.pm
@@ -157,7 +157,8 @@ sub authentication {
                 $log->syslog('notice',
                     'Password in database seems encrypted. Run upgrade_sympa_password.pl to rehash passwords'
                 );
-                Sympa::send_notify_to_listmaster('*', 'password_encrypted', {});
+                Sympa::send_notify_to_listmaster('*', 'password_encrypted',
+                    {});
                 return undef;
             }
 
diff --git a/src/sbin/archived.pl.in b/src/sbin/archived.pl.in
index 8a57fad30..1fbecadf8 100644
--- a/src/sbin/archived.pl.in
+++ b/src/sbin/archived.pl.in
@@ -9,8 +9,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
-# top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,6 @@ use Getopt::Long;
 use Pod::Usage;
 use POSIX qw();
 
-use Sympa::Alarm;
 use Conf;
 use Sympa::Constants;
 use Sympa::Crash;    # Show traceback.
@@ -43,6 +42,7 @@ use Sympa::Language;
 use Sympa::Log;
 use Sympa::Process;
 use Sympa::Spindle::ProcessArchive;
+use Sympa::Spool::Listmaster;
 
 my $process = Sympa::Process->instance;
 $process->init(pidname => 'archived');
@@ -167,7 +167,7 @@ while (not $spindle->{finish}) {
 }
 
 # Purge grouped notifications.
-Sympa::Alarm->instance->flush(purge => 1);
+Sympa::Spool::Listmaster->instance->flush(purge => 1);
 
 ## Free zombie sendmail processes.
 #Sympa::Process->instance->reap_child;
diff --git a/src/sbin/bounced.pl.in b/src/sbin/bounced.pl.in
index 86147b682..f3e75722c 100644
--- a/src/sbin/bounced.pl.in
+++ b/src/sbin/bounced.pl.in
@@ -9,8 +9,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
-# top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,6 @@ use Getopt::Long;
 use Pod::Usage;
 use POSIX qw();
 
-use Sympa::Alarm;
 use Conf;
 use Sympa::Constants;
 use Sympa::Crash;    # Show traceback.
@@ -48,6 +47,7 @@ use Sympa::DatabaseManager;
 use Sympa::Log;
 use Sympa::Process;
 use Sympa::Spindle::ProcessBounce;
+use Sympa::Spool::Listmaster;
 
 my $process = Sympa::Process->instance;
 $process->init(pidname => 'bounced');
@@ -165,7 +165,7 @@ while (not $spindle->{finish}) {
 }
 
 # Purge grouped notifications
-Sympa::Alarm->instance->flush(purge => 1);
+Sympa::Spool::Listmaster->instance->flush(purge => 1);
 
 $log->syslog('notice', 'Bounced exited normally due to signal');
 $process->remove_pid(final => 1);
diff --git a/src/sbin/bulk.pl.in b/src/sbin/bulk.pl.in
index 4e0d918f4..bc8d78965 100644
--- a/src/sbin/bulk.pl.in
+++ b/src/sbin/bulk.pl.in
@@ -9,8 +9,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,6 @@ use Getopt::Long;
 use Pod::Usage;
 use POSIX qw();
 
-use Sympa::Alarm;
 use Conf;
 use Sympa::Constants;
 use Sympa::Crash;    # Show traceback.
@@ -42,6 +41,7 @@ use Sympa::Log;
 use Sympa::Mailer;
 use Sympa::Process;
 use Sympa::Spindle::ProcessOutgoing;
+use Sympa::Spool::Listmaster;
 use Sympa::Tools::Data;
 
 my $process = Sympa::Process->instance;
@@ -165,7 +165,7 @@ while (not $spindle->{finish}) {
 }
 
 # Purge grouped notifications
-Sympa::Alarm->instance->flush(purge => 1);
+Sympa::Spool::Listmaster->instance->flush(purge => 1);
 
 ## Free zombie sendmail process.
 #Sympa::Process->instance->reap_child;
diff --git a/src/sbin/sympa_automatic.pl.in b/src/sbin/sympa_automatic.pl.in
index 40a3cd3b8..08211e075 100644
--- a/src/sbin/sympa_automatic.pl.in
+++ b/src/sbin/sympa_automatic.pl.in
@@ -9,8 +9,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,6 @@ use Getopt::Long;
 use Pod::Usage;
 use POSIX qw();
 
-use Sympa::Alarm;
 use Conf;
 use Sympa::Constants;
 use Sympa::Crash;    # Show traceback.
@@ -43,6 +42,7 @@ use Sympa::Log;
 use Sympa::Mailer;
 use Sympa::Process;
 use Sympa::Spindle::ProcessAutomatic;
+use Sympa::Spool::Listmaster;
 use Sympa::Tools::Data;
 
 my $process = Sympa::Process->instance;
@@ -184,7 +184,7 @@ while (not $spindle->{finish} or $spindle->{finish} ne 'term') {
 }
 
 # Purge grouped notifications
-Sympa::Alarm->instance->flush(purge => 1);
+Sympa::Spool::Listmaster->instance->flush(purge => 1);
 
 ## Free zombie sendmail processes.
 #Sympa::Process->instance->reap_child;
diff --git a/src/sbin/sympa_msg.pl.in b/src/sbin/sympa_msg.pl.in
index 6b22b282b..3cdc51ff7 100644
--- a/src/sbin/sympa_msg.pl.in
+++ b/src/sbin/sympa_msg.pl.in
@@ -9,8 +9,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
-# directory of this distribution and at
+# Copyright 2017, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,6 @@ use Getopt::Long;
 use Pod::Usage;
 use POSIX qw();
 
-use Sympa::Alarm;
 use Conf;
 use Sympa::Constants;
 use Sympa::Crash;    # Show traceback.
@@ -45,6 +44,7 @@ use Sympa::Mailer;
 use Sympa::Process;
 use Sympa::Spindle::ProcessDigest;
 use Sympa::Spindle::ProcessIncoming;
+use Sympa::Spool::Listmaster;
 use Sympa::Tools::Data;
 
 my $process = Sympa::Process->instance;
@@ -267,7 +267,7 @@ while (not $spindle->{finish} or $spindle->{finish} ne 'term') {
 }
 
 # Purge grouped notifications
-Sympa::Alarm->instance->flush(purge => 1);
+Sympa::Spool::Listmaster->instance->flush(purge => 1);
 
 $log->syslog('notice', 'Sympa/msg exited normally due to signal');
 $process->remove_pid;
diff --git a/src/sbin/task_manager.pl.in b/src/sbin/task_manager.pl.in
index 735dc348e..23b5753b9 100644
--- a/src/sbin/task_manager.pl.in
+++ b/src/sbin/task_manager.pl.in
@@ -9,8 +9,8 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
-# top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
+# the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,13 +34,13 @@ use Getopt::Long;
 use Pod::Usage;
 use POSIX qw();
 
-use Sympa::Alarm;
 use Conf;
 use Sympa::Constants;
 use Sympa::Crash;    # Show traceback.
 use Sympa::Log;
 use Sympa::Process;
 use Sympa::Spindle::ProcessTask;
+use Sympa::Spool::Listmaster;
 
 my $process = Sympa::Process->instance;
 $process->init(pidname => 'task_manager');
@@ -154,7 +154,7 @@ while (not $spindle->{finish}) {
 }
 
 # Purge grouped notifications
-Sympa::Alarm->instance->flush(purge => 1);
+Sympa::Spool::Listmaster->instance->flush(purge => 1);
 
 $log->syslog('notice', 'Task_Manager exited normally due to signal');
 $process->remove_pid(final => 1);