diff --git a/site-modules/profile/manifests/swh/deploy/archiver_content_updater.pp b/site-modules/profile/manifests/swh/deploy/archiver_content_updater.pp
index a1035837..decf0f9d 100644
--- a/site-modules/profile/manifests/swh/deploy/archiver_content_updater.pp
+++ b/site-modules/profile/manifests/swh/deploy/archiver_content_updater.pp
@@ -1,36 +1,36 @@
 # Deployment of the swh.storage.archiver.updater
 
 class profile::swh::deploy::archiver_content_updater {
-  include profile::swh::deploy::archiver
+  include profile::swh::deploy::base_archiver
 
   $conf_file = lookup('swh::deploy::archiver_content_updater::conf_file')
   $user = lookup('swh::deploy::archiver_content_updater::user')
   $group = lookup('swh::deploy::archiver_content_updater::group')
 
   $content_updater_config = lookup('swh::deploy::archiver_content_updater::config')
 
   $service_name = 'swh-archiver-content-updater'
   $unit_name = "${service_name}.service"
 
   file {$conf_file:
     ensure  => present,
     owner   => 'root',
     group   => $group,
     mode    => '0640',
     content => inline_template("<%= @content_updater_config.to_yaml %>\n"),
     notify  => Service[$service_name],
   }
 
   # Template uses variables
   #  - $user
   #  - $group
   #
   ::systemd::unit_file {$unit_name:
     ensure  => present,
     content => template('profile/swh/deploy/archiver/swh-content-updater.service.erb'),
   } ~> service {$service_name:
     ensure  => running,
     enable  => false,
     require => File[$conf_file],
   }
 }
diff --git a/site-modules/profile/manifests/swh/deploy/archiver.pp b/site-modules/profile/manifests/swh/deploy/base_archiver.pp
similarity index 80%
rename from site-modules/profile/manifests/swh/deploy/archiver.pp
rename to site-modules/profile/manifests/swh/deploy/base_archiver.pp
index a8ed46b6..3cc2b50e 100644
--- a/site-modules/profile/manifests/swh/deploy/archiver.pp
+++ b/site-modules/profile/manifests/swh/deploy/base_archiver.pp
@@ -1,12 +1,12 @@
 # Archiver base configuration
 
-class profile::swh::deploy::archiver {
+class profile::swh::deploy::base_archiver {
   include ::profile::swh::deploy::objstorage_cloud
 
   $packages = ['python3-swh.archiver']
 
   package {$packages:
     ensure => 'installed',
   }
 
 }
diff --git a/site-modules/profile/manifests/swh/deploy/worker/archiver.pp b/site-modules/profile/manifests/swh/deploy/worker/archiver.pp
index 6a66069e..8fac5b0f 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/archiver.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/archiver.pp
@@ -1,14 +1,14 @@
 # Deployment for archiver (content)
 class profile::swh::deploy::worker::archiver {
-  include ::profile::swh::deploy::archiver
+  include ::profile::swh::deploy::base_archiver
 
   $max_tasks_per_child = lookup('swh::deploy::worker::archiver::max_tasks_per_child')
 
   ::profile::swh::deploy::worker::instance {'archiver':
     ensure              => present,
     max_tasks_per_child => $max_tasks_per_child,
     require             => [
       Package[$packages],
     ],
   }
 }