diff --git a/swh/loader/package/gnu.py b/swh/loader/package/gnu.py
index 12d765d..6dbfbad 100644
--- a/swh/loader/package/gnu.py
+++ b/swh/loader/package/gnu.py
@@ -1,188 +1,187 @@
 # Copyright (C) 2019  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import logging
 import re
 
 from os import path
 
 from typing import Dict, Generator, Optional, Sequence, Tuple
 
 from swh.loader.package.loader import PackageLoader
 
 from swh.model.identifiers import normalize_timestamp
 
 
 logger = logging.getLogger(__name__)
 
 
 # to recognize existing naming pattern
 extensions = [
     'zip',
     'tar',
     'gz', 'tgz',
     'bz2', 'bzip2',
     'lzma', 'lz',
     'xz',
     'Z',
 ]
 
 version_keywords = [
     'cygwin_me',
     'w32', 'win32', 'nt', 'cygwin', 'mingw',
     'latest', 'alpha', 'beta',
     'release', 'stable',
     'hppa',
     'solaris', 'sunos', 'sun4u', 'sparc', 'sun',
     'aix', 'ibm', 'rs6000',
     'i386', 'i686',
     'linux', 'redhat', 'linuxlibc',
     'mips',
     'powerpc', 'macos', 'apple', 'darwin', 'macosx', 'powermacintosh',
     'unknown',
     'netbsd', 'freebsd',
     'sgi', 'irix',
 ]
 
 # Match a filename into components.
 #
 # We use Debian's release number heuristic: A release number starts
 # with a digit, and is followed by alphanumeric characters or any of
 # ., +, :, ~ and -
 #
 # We hardcode a list of possible extensions, as this release number
 # scheme would match them too... We match on any combination of those.
 #
 # Greedy matching is done right to left (we only match the extension
 # greedily with +, software_name and release_number are matched lazily
 # with +? and *?).
 
 pattern = r'''
 ^
 (?:
     # We have a software name and a release number, separated with a
     # -, _ or dot.
     (?P<software_name1>.+?[-_.])
     (?P<release_number>(%(vkeywords)s|[0-9][0-9a-zA-Z_.+:~-]*?)+)
 |
     # We couldn't match a release number, put everything in the
     # software name.
     (?P<software_name2>.+?)
 )
 (?P<extension>(?:\.(?:%(extensions)s))+)
 $
 ''' % {
     'extensions': '|'.join(extensions),
     'vkeywords': '|'.join('%s[-]?' % k for k in version_keywords),
 }
 
 
 def get_version(url: str) -> str:
     """Extract branch name from tarball url
 
     Args:
         url (str): Tarball URL
 
     Returns:
         byte: Branch name
 
     Example:
         For url = https://ftp.gnu.org/gnu/8sync/8sync-0.2.0.tar.gz
 
         >>> get_version(url)
         '0.2.0'
 
     """
     filename = path.split(url)[-1]
     m = re.match(pattern, filename,
                  flags=re.VERBOSE | re.IGNORECASE)
     if m:
         d = m.groupdict()
         if d['software_name1'] and d['release_number']:
             return d['release_number']
         if d['software_name2']:
             return d['software_name2']
 
     return ''
 
 
 class GNULoader(PackageLoader):
     visit_type = 'gnu'
     SWH_PERSON = {
         'name': b'Software Heritage',
         'fullname': b'Software Heritage',
         'email': b'robot@softwareheritage.org'
     }
     REVISION_MESSAGE = b'swh-loader-package: synthetic revision message'
 
-    def __init__(self, package: str, package_url: str, tarballs: Sequence):
+    def __init__(self, package_url: str, tarballs: Sequence):
         """Loader constructor.
 
         For now, this is the lister's task output.
 
         Args:
-            package: Package's name (unused)
             package_url: Origin url
 
             tarballs: List of dict with keys `date` (date) and `archive` (str)
             the url to retrieve one versioned archive
 
         """
         super().__init__(url=package_url)
         self.tarballs = list(sorted(tarballs, key=lambda v: v['time']))
 
     def get_versions(self) -> Sequence[str]:
         versions = []
         for archive in self.tarballs:
             v = get_version(archive['archive'])
             if v:
                 versions.append(v)
         return versions
 
     def get_default_release(self) -> str:
         # It's the most recent, so for this loader, it's the last one
         return get_version(self.tarballs[-1]['archive'])
 
     def get_artifacts(self, version: str) -> Generator[
             Tuple[str, str, Dict], None, None]:
         for a_metadata in self.tarballs:
             url = a_metadata['archive']
             artifact_version = get_version(url)
             if version == artifact_version:
                 filename = path.split(url)[-1]
                 yield filename, url, a_metadata
 
     def resolve_revision_from(
             self, known_artifacts: Dict, artifact_metadata: Dict) \
             -> Optional[bytes]:
         def pk(d):
             return [d.get(k) for k in ['time', 'archive', 'length']]
 
         artifact_pk = pk(artifact_metadata)
         for rev_id, known_artifact in known_artifacts.items():
             logging.debug('known_artifact: %s', known_artifact)
             known_pk = pk(known_artifact['extrinsic']['raw'])
             if artifact_pk == known_pk:
                 return rev_id
 
     def build_revision(
             self, a_metadata: Dict, a_uncompressed_path: str) -> Dict:
         normalized_date = normalize_timestamp(int(a_metadata['time']))
         return {
             'message': self.REVISION_MESSAGE,
             'date': normalized_date,
             'author': self.SWH_PERSON,
             'committer': self.SWH_PERSON,
             'committer_date': normalized_date,
             'parents': [],
             'metadata': {
                 'intrinsic': {},
                 'extrinsic': {
                     'provider': self.url,
                     'when': self.visit_date.isoformat(),
                     'raw': a_metadata,
                 },
             },
         }
diff --git a/swh/loader/package/tests/test_gnu.py b/swh/loader/package/tests/test_gnu.py
index 13e5f06..7b0fc63 100644
--- a/swh/loader/package/tests/test_gnu.py
+++ b/swh/loader/package/tests/test_gnu.py
@@ -1,353 +1,348 @@
 # Copyright (C) 2019 The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import os
 import re
 
 from swh.model.hashutil import hash_to_bytes
 
 from swh.loader.package.gnu import GNULoader, get_version
 from swh.loader.package.tests.common import (
     check_snapshot, check_metadata_paths
 )
 
 
 def test_get_version():
     """From url to branch name should yield something relevant
 
     """
     for url, expected_branchname in [
             ('https://gnu.org/sthg/info-2.1.0.tar.gz', '2.1.0'),
             ('https://gnu.org/sthg/info-2.1.2.zip', '2.1.2'),
             ('https://sthg.org/gnu/sthg.tar.gz', 'sthg'),
             ('https://sthg.org/gnu/DLDF-1.1.4.tar.gz', '1.1.4'),
             ('https://sthg.org/gnu/anubis-latest.tar.bz2', 'latest'),
             ('https://ftp.org/gnu/aris-w32.zip', 'w32'),
             ('https://ftp.org/gnu/aris-w32-2.2.zip', 'w32-2.2'),
             ('https://ftp.org/gnu/autogen.info.tar.gz', 'autogen.info'),
             ('https://ftp.org/gnu/crypto-build-demo.tar.gz',
              'crypto-build-demo'),
             ('https://ftp.org/gnu/clue+clio+xit.clisp.tar.gz',
              'clue+clio+xit.clisp'),
             ('https://ftp.org/gnu/clue+clio.for-pcl.tar.gz',
              'clue+clio.for-pcl'),
             ('https://ftp.org/gnu/clisp-hppa2.0-hp-hpux10.20.tar.gz',
              'hppa2.0-hp-hpux10.20'),
             ('clisp-i386-solaris2.6.tar.gz', 'i386-solaris2.6'),
             ('clisp-mips-sgi-irix6.5.tar.gz', 'mips-sgi-irix6.5'),
             ('clisp-powerpc-apple-macos.tar.gz', 'powerpc-apple-macos'),
             ('clisp-powerpc-unknown-linuxlibc6.tar.gz',
              'powerpc-unknown-linuxlibc6'),
 
             ('clisp-rs6000-ibm-aix3.2.5.tar.gz', 'rs6000-ibm-aix3.2.5'),
             ('clisp-sparc-redhat51-linux.tar.gz', 'sparc-redhat51-linux'),
             ('clisp-sparc-sun-solaris2.4.tar.gz', 'sparc-sun-solaris2.4'),
             ('clisp-sparc-sun-sunos4.1.3_U1.tar.gz',
              'sparc-sun-sunos4.1.3_U1'),
             ('clisp-2.25.1-powerpc-apple-MacOSX.tar.gz',
              '2.25.1-powerpc-apple-MacOSX'),
             ('clisp-2.27-PowerMacintosh-powerpc-Darwin-1.3.7.tar.gz',
              '2.27-PowerMacintosh-powerpc-Darwin-1.3.7'),
             ('clisp-2.27-i686-unknown-Linux-2.2.19.tar.gz',
              '2.27-i686-unknown-Linux-2.2.19'),
             ('clisp-2.28-i386-i386-freebsd-4.3-RELEASE.tar.gz',
              '2.28-i386-i386-freebsd-4.3-RELEASE'),
             ('clisp-2.28-i686-unknown-cygwin_me-4.90-1.3.10.tar.gz',
              '2.28-i686-unknown-cygwin_me-4.90-1.3.10'),
             ('clisp-2.29-i386-i386-freebsd-4.6-STABLE.tar.gz',
              '2.29-i386-i386-freebsd-4.6-STABLE'),
             ('clisp-2.29-i686-unknown-cygwin_nt-5.0-1.3.12.tar.gz',
              '2.29-i686-unknown-cygwin_nt-5.0-1.3.12'),
             ('gcl-2.5.3-ansi-japi-xdr.20030701_mingw32.zip',
              '2.5.3-ansi-japi-xdr.20030701_mingw32'),
             ('gettext-runtime-0.13.1.bin.woe32.zip', '0.13.1.bin.woe32'),
             ('sather-logo_images.tar.gz', 'sather-logo_images'),
             ('sather-specification-000328.html.tar.gz', '000328.html')
 
     ]:
         actual_branchname = get_version(url)
 
         assert actual_branchname == expected_branchname
 
 
 _expected_new_contents_first_visit = [
     'e9258d81faf5881a2f96a77ba609396f82cb97ad',
     '1170cf105b04b7e2822a0e09d2acf71da7b9a130',
     'fbd27c3f41f2668624ffc80b7ba5db9b92ff27ac',
     '0057bec9b5422aff9256af240b177ac0e3ac2608',
     '2b8d0d0b43a1078fc708930c8ddc2956a86c566e',
     '27de3b3bc6545d2a797aeeb4657c0e215a0c2e55',
     '2e6db43f5cd764e677f416ff0d0c78c7a82ef19b',
     'ae9be03bd2a06ed8f4f118d3fe76330bb1d77f62',
     'edeb33282b2bffa0e608e9d2fd960fd08093c0ea',
     'd64e64d4c73679323f8d4cde2643331ba6c20af9',
     '7a756602914be889c0a2d3952c710144b3e64cb0',
     '84fb589b554fcb7f32b806951dcf19518d67b08f',
     '8624bcdae55baeef00cd11d5dfcfa60f68710a02',
     'e08441aeab02704cfbd435d6445f7c072f8f524e',
     'f67935bc3a83a67259cda4b2d43373bd56703844',
     '809788434b433eb2e3cfabd5d591c9a659d5e3d8',
     '7d7c6c8c5ebaeff879f61f37083a3854184f6c41',
     'b99fec102eb24bffd53ab61fc30d59e810f116a2',
     '7d149b28eaa228b3871c91f0d5a95a2fa7cb0c68',
     'f0c97052e567948adf03e641301e9983c478ccff',
     '7fb724242e2b62b85ca64190c31dcae5303e19b3',
     '4f9709e64a9134fe8aefb36fd827b84d8b617ab5',
     '7350628ccf194c2c3afba4ac588c33e3f3ac778d',
     '0bb892d9391aa706dc2c3b1906567df43cbe06a2',
     '49d4c0ce1a16601f1e265d446b6c5ea6b512f27c',
     '6b5cc594ac466351450f7f64a0b79fdaf4435ad3',
     '3046e5d1f70297e2a507b98224b6222c9688d610',
     '1572607d456d7f633bc6065a2b3048496d679a31',
 ]
 
 _expected_new_directories_first_visit = [
     'daabc65ec75d487b1335ffc101c0ac11c803f8fc',
     '263be23b4a8101d3ad0d9831319a3e0f2b065f36',
     '7f6e63ba6eb3e2236f65892cd822041f1a01dd5c',
     '4db0a3ecbc976083e2dac01a62f93729698429a3',
     'dfef1c80e1098dd5deda664bb44a9ab1f738af13',
     'eca971d346ea54d95a6e19d5051f900237fafdaa',
     '3aebc29ed1fccc4a6f2f2010fb8e57882406b528',
 ]
 
 _expected_new_revisions_first_visit = {
     '44183488c0774ce3c957fa19ba695cf18a4a42b3':
     '3aebc29ed1fccc4a6f2f2010fb8e57882406b528'
 }
 
 _expected_branches_first_visit = {
     'HEAD': {
         'target_type': 'alias',
         'target': 'releases/0.1.0',
     },
     'releases/0.1.0': {
         'target_type': 'revision',
         'target': '44183488c0774ce3c957fa19ba695cf18a4a42b3',
     },
 }
 
 # hash is different then before as we changed the snapshot
 # gnu used to use `release/` (singular) instead of plural
 _expected_new_snapshot_first_visit_id = 'c419397fd912039825ebdbea378bc6283f006bf5'  # noqa
 
 
 def test_visit_with_no_artifact_found(swh_config, requests_mock):
-    package = '8sync'
     package_url = 'https://ftp.gnu.org/gnu/8sync/'
     tarballs = [{
         'time': '944729610',
         'archive': 'https://ftp.gnu.org/gnu/8sync/8sync-0.1.0.tar.gz',
         'length': 221837,
     }]
 
-    loader = GNULoader(package, package_url, tarballs)
+    loader = GNULoader(package_url, tarballs)
     requests_mock.get(re.compile('https://'), status_code=404)
 
     actual_load_status = loader.load()
     assert actual_load_status['status'] == 'uneventful'
     stats = loader.storage.stat_counters()
 
     assert {
         'content': 0,
         'directory': 0,
         'origin': 1,
         'origin_visit': 1,
         'person': 0,
         'release': 0,
         'revision': 0,
         'skipped_content': 0,
         'snapshot': 1,
     } == stats
 
     origin_visit = next(loader.storage.origin_visit_get(package_url))
     assert origin_visit['status'] == 'partial'
 
 
 def test_check_revision_metadata_structure(swh_config, local_get):
-    package = '8sync'
     package_url = 'https://ftp.gnu.org/gnu/8sync/'
     tarballs = [{
         'time': '944729610',
         'archive': 'https://ftp.gnu.org/gnu/8sync/8sync-0.1.0.tar.gz',
         'length': 221837,
     }]
 
-    loader = GNULoader(package, package_url, tarballs)
+    loader = GNULoader(package_url, tarballs)
 
     actual_load_status = loader.load()
     assert actual_load_status['status'] == 'eventful'
 
     expected_revision_id = hash_to_bytes(
         '44183488c0774ce3c957fa19ba695cf18a4a42b3')
     revision = list(loader.storage.revision_get([expected_revision_id]))[0]
 
     assert revision is not None
 
     check_metadata_paths(revision['metadata'], paths=[
         ('intrinsic', dict),
         ('extrinsic.provider', str),
         ('extrinsic.when', str),
         ('extrinsic.raw', dict),
         ('original_artifact.filename', str),
         ('original_artifact.length', int),
         ('original_artifact.checksums', dict),
     ])
 
 
 def test_visit_with_release_artifact_no_prior_visit(swh_config, local_get):
     """With no prior visit, load a gnu project ends up with 1 snapshot
 
     """
     assert 'SWH_CONFIG_FILENAME' in os.environ  # cf. tox.ini
-    package = '8sync'
     package_url = 'https://ftp.gnu.org/gnu/8sync/'
     tarballs = [{
         'time': 944729610,
         'archive': 'https://ftp.gnu.org/gnu/8sync/8sync-0.1.0.tar.gz',
         'length': 221837,
     }]
 
-    loader = GNULoader(package, package_url, tarballs)
+    loader = GNULoader(package_url, tarballs)
 
     actual_load_status = loader.load()
     assert actual_load_status['status'] == 'eventful'
 
     stats = loader.storage.stat_counters()
     assert {
         'content': len(_expected_new_contents_first_visit),
         'directory': len(_expected_new_directories_first_visit),
         'origin': 1,
         'origin_visit': 1,
         'person': 1,
         'release': 0,
         'revision': len(_expected_new_revisions_first_visit),
         'skipped_content': 0,
         'snapshot': 1
     } == stats
 
     expected_contents = map(hash_to_bytes, _expected_new_contents_first_visit)
     assert list(loader.storage.content_missing_per_sha1(expected_contents)) \
         == []
 
     expected_dirs = map(hash_to_bytes, _expected_new_directories_first_visit)
     assert list(loader.storage.directory_missing(expected_dirs)) == []
 
     expected_revs = map(hash_to_bytes, _expected_new_revisions_first_visit)
     assert list(loader.storage.revision_missing(expected_revs)) == []
 
     expected_snapshot = {
         'id': _expected_new_snapshot_first_visit_id,
         'branches': _expected_branches_first_visit,
     }
 
     check_snapshot(expected_snapshot, loader.storage)
 
 
 def test_2_visits_without_change(swh_config, local_get):
     """With no prior visit, load a gnu project ends up with 1 snapshot
 
     """
     assert 'SWH_CONFIG_FILENAME' in os.environ  # cf. tox.ini
-    package = '8sync'
     url = 'https://ftp.gnu.org/gnu/8sync/'
     tarballs = [{
         'time': 944729610,
         'archive': 'https://ftp.gnu.org/gnu/8sync/8sync-0.1.0.tar.gz',
         'length': 221837,
     }]
 
-    loader = GNULoader(package, url, tarballs)
+    loader = GNULoader(url, tarballs)
     actual_load_status = loader.load()
     assert actual_load_status['status'] == 'eventful'
     origin_visit = list(loader.storage.origin_visit_get(url))[-1]
     assert origin_visit['status'] == 'full'
 
     actual_load_status2 = loader.load()
     assert actual_load_status2['status'] == 'uneventful'
     origin_visit2 = list(loader.storage.origin_visit_get(url))[-1]
     assert origin_visit2['status'] == 'full'
 
     urls = [
         m.url for m in local_get.request_history
         if m.url.startswith('https://ftp.gnu.org')
     ]
     assert len(urls) == 1
 
 
 def test_2_visits_with_new_artifact(swh_config, local_get):
     """With no prior visit, load a gnu project ends up with 1 snapshot
 
     """
     assert 'SWH_CONFIG_FILENAME' in os.environ  # cf. tox.ini
-    package = '8sync'
     url = 'https://ftp.gnu.org/gnu/8sync/'
     tarball1 = {
         'time': 944729610,
         'archive': 'https://ftp.gnu.org/gnu/8sync/8sync-0.1.0.tar.gz',
         'length': 221837,
     }
 
-    loader = GNULoader(package, url, [tarball1])
+    loader = GNULoader(url, [tarball1])
     actual_load_status = loader.load()
     assert actual_load_status['status'] == 'eventful'
     origin_visit = list(loader.storage.origin_visit_get(url))[-1]
     assert origin_visit['status'] == 'full'
 
     stats = loader.storage.stat_counters()
     assert {
         'content': len(_expected_new_contents_first_visit),
         'directory': len(_expected_new_directories_first_visit),
         'origin': 1,
         'origin_visit': 1,
         'person': 1,
         'release': 0,
         'revision': len(_expected_new_revisions_first_visit),
         'skipped_content': 0,
         'snapshot': 1
     } == stats
 
     urls = [
         m.url for m in local_get.request_history
         if m.url.startswith('https://ftp.gnu.org')
     ]
     assert len(urls) == 1
 
     tarball2 = {
         'time': 1480991830,
         'archive': 'https://ftp.gnu.org/gnu/8sync/8sync-0.2.0.tar.gz',
         'length': 238466,
     }
-    loader2 = GNULoader(package, url, [tarball1, tarball2])
+    loader2 = GNULoader(url, [tarball1, tarball2])
     # implementation detail: share the storage in between visits
     loader2.storage = loader.storage
     stats2 = loader2.storage.stat_counters()
     assert stats == stats2  # ensure we share the storage
 
     actual_load_status2 = loader2.load()
     assert actual_load_status2['status'] == 'eventful'
 
     stats2 = loader.storage.stat_counters()
     assert {
         'content': len(_expected_new_contents_first_visit) + 14,
         'directory': len(_expected_new_directories_first_visit) + 8,
         'origin': 1,
         'origin_visit': 1 + 1,
         'person': 1,
         'release': 0,
         'revision': len(_expected_new_revisions_first_visit) + 1,
         'skipped_content': 0,
         'snapshot': 1 + 1,
     } == stats2
 
     origin_visit2 = list(loader.storage.origin_visit_get(url))[-1]
     assert origin_visit2['status'] == 'full'
 
     urls = [
         m.url for m in local_get.request_history
         if m.url.startswith('https://ftp.gnu.org')
     ]
     # 1 artifact (2nd time no modification) + 1 new artifact
     assert len(urls) == 2