diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index d7802d9069db791c9e3437efe730d9eb759860aa..b82e263e5987ce1349042cd1797b3458baa57593 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -30,7 +30,7 @@ environment.setup_logging()
 logger = logging.getLogger(__name__)
 
 
-def log_entry_and_exit(f):
+def log_task_entry_and_exit(f):
     # cf. https://stackoverflow.com/a/47663642
     def _w(*args, **kwargs):
         logger.debug(f'>>> {f.__name__}{args}')
@@ -78,7 +78,7 @@ class InventoryTask(Task):
 
 
 @app.task(base=InventoryTask, bind=True, name='snmp_refresh_interfaces')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def snmp_refresh_interfaces(self, hostname, community):
     value = list(snmp.get_router_snmp_indexes(hostname, community))
     r = get_next_redis(InventoryTask.config)
@@ -86,7 +86,7 @@ def snmp_refresh_interfaces(self, hostname, community):
 
 
 @app.task(base=InventoryTask, bind=True, name='netconf_refresh_config')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def netconf_refresh_config(self, hostname):
     netconf_doc = juniper.load_config(hostname, InventoryTask.config["ssh"])
     netconf_str = etree.tostring(netconf_doc, encoding='unicode')
@@ -95,7 +95,7 @@ def netconf_refresh_config(self, hostname):
 
 
 @app.task(base=InventoryTask, bind=True, name='update_interfaces_to_services')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def update_interfaces_to_services(self):
     interface_services = defaultdict(list)
     with db.connection(InventoryTask.config["ops-db"]) as cx:
@@ -119,7 +119,7 @@ def update_interfaces_to_services(self):
 
 
 @app.task(base=InventoryTask, bind=True, name='import_unmanaged_interfaces')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def import_unmanaged_interfaces(self):
 
     def _convert(d):
@@ -151,7 +151,7 @@ def import_unmanaged_interfaces(self):
 
 
 @app.task(base=InventoryTask, bind=True, name='update_access_services')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def update_access_services(self):
 
     access_services = {}
@@ -180,7 +180,7 @@ def update_access_services(self):
 
 
 @app.task(base=InventoryTask, bind=True, name='update_lg_routers')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def update_lg_routers(self):
 
     r = get_next_redis(InventoryTask.config)
@@ -197,7 +197,7 @@ def update_lg_routers(self):
 
 
 @app.task(base=InventoryTask, bind=True, name='update_equipment_locations')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def update_equipment_locations(self):
     r = get_next_redis(InventoryTask.config)
     rp = r.pipeline()
@@ -216,7 +216,7 @@ def update_equipment_locations(self):
 
 
 @app.task(base=InventoryTask, bind=True, name='update_circuit_hierarchy')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def update_circuit_hierarchy(self):
 
     # TODO: integers are not JSON keys
@@ -246,7 +246,7 @@ def update_circuit_hierarchy(self):
 
 
 @app.task(base=InventoryTask, bind=True, name='update_geant_lambdas')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def update_geant_lambdas(self):
 
     r = get_next_redis(InventoryTask.config)
@@ -266,7 +266,7 @@ def update_geant_lambdas(self):
 
 @app.task(base=InventoryTask, bind=True,
           name='update_neteng_managed_device_list')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def update_neteng_managed_device_list(self):
     self.update_state(
         state=states.STARTED,
@@ -420,7 +420,7 @@ def refresh_juniper_interface_list(hostname, netconf):
 
 
 @app.task(base=InventoryTask, bind=True, name='reload_router_config')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def reload_router_config(self, hostname):
     self.update_state(
         state=states.STARTED,
@@ -587,7 +587,7 @@ def _wait_for_tasks(task_ids, update_callback=lambda s: None):
 
 
 @app.task(base=InventoryTask, bind=True, name='refresh_finalizer')
-@log_entry_and_exit
+@log_task_entry_and_exit
 def refresh_finalizer(self, pending_task_ids_json):
 
     input_schema = {