diff --git a/swh/loader/git/updater.py b/swh/loader/git/loader.py
similarity index 100%
rename from swh/loader/git/updater.py
rename to swh/loader/git/loader.py
diff --git a/swh/loader/git/tasks.py b/swh/loader/git/tasks.py
index 8b67fcc..fdd5165 100644
--- a/swh/loader/git/tasks.py
+++ b/swh/loader/git/tasks.py
@@ -1,55 +1,55 @@
 # Copyright (C) 2015-2018  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 dateutil.parser
 
 from swh.scheduler.task import Task
 
 from .from_disk import GitLoader, GitLoaderFromArchive
-from .updater import BulkUpdater
+from .loader import BulkUpdater
 
 
 # TODO: rename to LoadRemoteGitRepository
 class UpdateGitRepository(Task):
     """Import a git repository from a remote location"""
     task_queue = 'swh_loader_git'
 
     def run_task(self, repo_url, base_url=None):
         """Import a git repository"""
         loader = BulkUpdater()
         loader.log = self.log
 
         return loader.load(repo_url, base_url=base_url)
 
 
 class LoadDiskGitRepository(Task):
     """Import a git repository from disk"""
     task_queue = 'swh_loader_git_express'
 
     def run_task(self, origin_url, directory, date):
         """Import a git repository, cloned in `directory` from `origin_url` at
         `date`."""
 
         loader = GitLoader()
         loader.log = self.log
 
         return loader.load(origin_url, directory, dateutil.parser.parse(date))
 
 
 class UncompressAndLoadDiskGitRepository(Task):
     """Import a git repository from a zip archive"""
     task_queue = 'swh_loader_git_archive'
 
     def run_task(self, origin_url, archive_path, date):
         """1. Uncompress an archive repository in a local and temporary folder
            2. Load it through the git disk loader
            3. Clean up the temporary folder
 
         """
         loader = GitLoaderFromArchive()
         loader.log = self.log
 
         return loader.load(
             origin_url, archive_path, dateutil.parser.parse(date))
diff --git a/swh/loader/git/tests/test_updater.py b/swh/loader/git/tests/test_loader.py
similarity index 83%
rename from swh/loader/git/tests/test_updater.py
rename to swh/loader/git/tests/test_loader.py
index 4d90d90..f30c2fc 100644
--- a/swh/loader/git/tests/test_updater.py
+++ b/swh/loader/git/tests/test_loader.py
@@ -1,22 +1,22 @@
-from swh.loader.git.updater import BulkUpdater
-from swh.loader.git.tests.test_loader import DirGitLoaderTest
+from swh.loader.git.loader import BulkUpdater
+from swh.loader.git.tests.test_from_disk import DirGitLoaderTest
 
 
 class BulkUpdaterTest(BulkUpdater):
     def parse_config_file(self, *args, **kwargs):
         return {
             **super().parse_config_file(*args, **kwargs),
             'storage': {'cls': 'memory', 'args': {}}
         }
 
 
 class TestBulkUpdater(DirGitLoaderTest):
     """Same tests as for the GitLoader, but running on BulkUpdater."""
     def setUp(self):
         super().setUp()
         self.loader = BulkUpdaterTest()
         self.storage = self.loader.storage
 
     def load(self):
         return self.loader.load(
             origin_url=self.repo_url)
diff --git a/swh/loader/git/tests/test_tasks.py b/swh/loader/git/tests/test_tasks.py
index 7ac6df6..56c2b57 100644
--- a/swh/loader/git/tests/test_tasks.py
+++ b/swh/loader/git/tests/test_tasks.py
@@ -1,71 +1,71 @@
 # Copyright (C) 2018  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 datetime
 import unittest
 from unittest.mock import patch
 
 from swh.loader.git.tasks import (
     UpdateGitRepository, LoadDiskGitRepository,
     UncompressAndLoadDiskGitRepository
 )
 
 
 class TestTasks(unittest.TestCase):
     def test_check_task_name(self):
         task = UpdateGitRepository()
         self.assertEqual(task.task_queue, 'swh_loader_git')
 
-    @patch('swh.loader.git.updater.BulkUpdater.load')
+    @patch('swh.loader.git.loader.BulkUpdater.load')
     def test_task(self, mock_loader):
         mock_loader.return_value = {'status': 'eventful'}
         task = UpdateGitRepository()
 
         # given
         actual_result = task.run_task('origin_url')
 
         self.assertEqual(actual_result, {'status': 'eventful'})
 
         mock_loader.assert_called_once_with('origin_url', base_url=None)
 
 
 class TestTasks2(unittest.TestCase):
     def test_check_task_name(self):
         task = LoadDiskGitRepository()
         self.assertEqual(task.task_queue, 'swh_loader_git_express')
 
     @patch('swh.loader.git.from_disk.GitLoader.load')
     def test_task(self, mock_loader):
         mock_loader.return_value = {'status': 'uneventful'}
         task = LoadDiskGitRepository()
 
         # given
         actual_result = task.run_task('origin_url2', '/some/repo',
                                       '2018-12-10 00:00')
 
         self.assertEqual(actual_result, {'status': 'uneventful'})
 
         mock_loader.assert_called_once_with(
             'origin_url2', '/some/repo', datetime.datetime(2018, 12, 10, 0, 0))
 
 
 class TestTasks3(unittest.TestCase):
     def test_check_task_name(self):
         task = UncompressAndLoadDiskGitRepository()
         self.assertEqual(task.task_queue, 'swh_loader_git_archive')
 
     @patch('swh.loader.git.from_disk.GitLoaderFromArchive.load')
     def test_task(self, mock_loader):
         mock_loader.return_value = {'status': 'failed'}
         task = UncompressAndLoadDiskGitRepository()
 
         # given
         actual_result = task.run_task('origin_url3', '/path/repo',
                                       '2017-01-10 00:00')
 
         self.assertEqual(actual_result, {'status': 'failed'})
 
         mock_loader.assert_called_once_with(
             'origin_url3', '/path/repo', datetime.datetime(2017, 1, 10, 0, 0))