diff --git a/debian/changelog b/debian/changelog
index 65ae87c..5ac659a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-swh-loader-vcs (0.0.1-1) unstable; urgency=low
+swh-loader (0.0.1-1) unstable; urgency=low
 
   *
 
  -- AUTHOR-NAME <AUTHOR-EMAIL>  <UTC-DATE>
diff --git a/debian/control b/debian/control
index 2e47bc7..a5fa5a2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,20 @@
-Source: swh-loader-vcs
+Source: swh-loader
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
                python3-all,
                python3-nose,
                python3-setuptools,
                python3-swh.core,
                python3-swh.storage,
                python3-retrying,
                python3-vcversioner
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/60/
 
-Package: python3-swh.loader.vcs
+Package: python3-swh.loader
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage <module-description>
diff --git a/debian/rules b/debian/rules
index a76aabc..6f0ec47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=swh-loader-vcs
+export PYBUILD_NAME=swh-loader
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
 
 override_dh_auto_test:
diff --git a/setup.py b/setup.py
index be94148..1965582 100644
--- a/setup.py
+++ b/setup.py
@@ -1,28 +1,28 @@
 from setuptools import setup
 
 
 def parse_requirements():
     requirements = []
     with open('requirements.txt') as f:
         for line in f.readlines():
             line = line.strip()
             if not line or line.startswith('#'):
                 continue
             requirements.append(line)
 
     return requirements
 
 
 setup(
-    name='swh.loader.vcs',
-    description='Software Heritage Loader VCS',
+    name='swh.loader',
+    description='Software Heritage Base Loader',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/60/',
-    packages=['swh.loader.vcs'],  # packages's modules
+    packages=['swh.loader'],  # packages's modules
     scripts=[],   # scripts to package
     install_requires=parse_requirements(),
     setup_requires=['vcversioner'],
     vcversioner={},
     include_package_data=True,
 )