Improve naming of tasks

Change-Id: I0e62a3be2d0d8c2b8f3d5c043581ccdddcb50242