diff --git a/data/location/azure_euwest.yaml b/data/location/azure_euwest.yaml
index 2c79fa85..3f1f5ace 100644
--- a/data/location/azure_euwest.yaml
+++ b/data/location/azure_euwest.yaml
@@ -1,21 +1,21 @@
 ---
 dns::forward_zones:
   'internal.softwareheritage.org.':
     - 192.168.200.22
   '100.168.192.in-addr.arpa.':
     - 192.168.200.22
   '101.168.192.in-addr.arpa.':
     - 192.168.200.22
 
 dns::forwarders: []
 dns::forwarder_insecure: false
 
 internal_network: 192.168.200.0/21
 
 swh::deploy::worker::instances:
-  - indexer_mimetype
+  - indexer_content_mimetype
   - indexer_fossology_license
   - indexer_origin_intrinsic_metadata
 
 swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::azure')}"
 swh::remote_service::objstorage::config: "%{alias('swh::remote_service::objstorage::config::azure_readonly_with_fallback')}"
diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_ctags.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_ctags.pp
similarity index 89%
rename from site-modules/profile/manifests/swh/deploy/worker/indexer_ctags.pp
rename to site-modules/profile/manifests/swh/deploy/worker/indexer_content_ctags.pp
index 081e1753..a1171396 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/indexer_ctags.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_ctags.pp
@@ -1,19 +1,19 @@
 # Deployment for swh-indexer-ctags
 
-class profile::swh::deploy::worker::indexer_ctags {
+class profile::swh::deploy::worker::indexer_content_ctags {
   include ::profile::swh::deploy::indexer
 
   $packages = ['universal-ctags']
   package {$packages:
     ensure => 'present',
   }
 
   Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_ctags':
     ensure       => 'stopped',
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
       Package[$packages],
     ],
   }
 }
diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_language.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_language.pp
similarity index 87%
rename from site-modules/profile/manifests/swh/deploy/worker/indexer_language.pp
rename to site-modules/profile/manifests/swh/deploy/worker/indexer_content_language.pp
index 0a0bedb1..10b56fa4 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/indexer_language.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_language.pp
@@ -1,14 +1,14 @@
 # Deployment for swh-indexer-language
 
-class profile::swh::deploy::worker::indexer_language {
+class profile::swh::deploy::worker::indexer_content_language {
   include ::profile::swh::deploy::indexer
   Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_language':
     ensure       => 'stopped',
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
     ],
   }
 }
diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_mimetype.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_mimetype.pp
similarity index 85%
rename from site-modules/profile/manifests/swh/deploy/worker/indexer_mimetype.pp
rename to site-modules/profile/manifests/swh/deploy/worker/indexer_content_mimetype.pp
index 687fc13d..c90f5669 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/indexer_mimetype.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_mimetype.pp
@@ -1,13 +1,13 @@
 # Deployment for swh-indexer-mimetype
 
-class profile::swh::deploy::worker::indexer_mimetype {
+class profile::swh::deploy::worker::indexer_content_mimetype {
   include ::profile::swh::deploy::indexer
 
   Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_mimetype':
     ensure       => present,
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
     ],
   }
 }