Final naming cleanup

Cleanup of all the task names.

@doudou namings should be now consistent