CFY-1295 rename mapping to task_mapping