diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_ctags.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_ctags.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_indexer_ctags.pp
rename to site-modules/profile/manifests/swh/deploy/worker/indexer_ctags.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_fossology_license.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_fossology_license.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_indexer_fossology_license.pp
rename to site-modules/profile/manifests/swh/deploy/worker/indexer_fossology_license.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_language.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_language.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_indexer_language.pp
rename to site-modules/profile/manifests/swh/deploy/worker/indexer_language.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_mimetype.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_mimetype.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_indexer_mimetype.pp
rename to site-modules/profile/manifests/swh/deploy/worker/indexer_mimetype.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_intrinsic_metadata.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_indexer_origin_intrinsic_metadata.pp
rename to site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_rehash.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_rehash.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_indexer_rehash.pp
rename to site-modules/profile/manifests/swh/deploy/worker/indexer_rehash.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_lister_debian.pp b/site-modules/profile/manifests/swh/deploy/worker/lister_debian.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_lister_debian.pp
rename to site-modules/profile/manifests/swh/deploy/worker/lister_debian.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_lister_github.pp b/site-modules/profile/manifests/swh/deploy/worker/lister_github.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_lister_github.pp
rename to site-modules/profile/manifests/swh/deploy/worker/lister_github.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_lister_gitlab.pp b/site-modules/profile/manifests/swh/deploy/worker/lister_gitlab.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_lister_gitlab.pp
rename to site-modules/profile/manifests/swh/deploy/worker/lister_gitlab.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_lister_pypi.pp b/site-modules/profile/manifests/swh/deploy/worker/lister_pypi.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_lister_pypi.pp
rename to site-modules/profile/manifests/swh/deploy/worker/lister_pypi.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_debian.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_debian.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_loader_debian.pp
rename to site-modules/profile/manifests/swh/deploy/worker/loader_debian.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_deposit.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_deposit.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_loader_deposit.pp
rename to site-modules/profile/manifests/swh/deploy/worker/loader_deposit.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_git.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_git.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_loader_git.pp
rename to site-modules/profile/manifests/swh/deploy/worker/loader_git.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_mercurial.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_mercurial.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_loader_mercurial.pp
rename to site-modules/profile/manifests/swh/deploy/worker/loader_mercurial.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_pypi.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_pypi.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_loader_pypi.pp
rename to site-modules/profile/manifests/swh/deploy/worker/loader_pypi.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_svn.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_svn.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_loader_svn.pp
rename to site-modules/profile/manifests/swh/deploy/worker/loader_svn.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_storage_archiver.pp b/site-modules/profile/manifests/swh/deploy/worker/storage_archiver.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_storage_archiver.pp
rename to site-modules/profile/manifests/swh/deploy/worker/storage_archiver.pp
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_vault_cooker.pp b/site-modules/profile/manifests/swh/deploy/worker/vault_cooker.pp
similarity index 100%
rename from site-modules/profile/manifests/swh/deploy/worker/swh_vault_cooker.pp
rename to site-modules/profile/manifests/swh/deploy/worker/vault_cooker.pp