Final naming cleanup

Cleanup of all the task names.

@doudou namings should be now consistent
Well, we definitely said name::Name is not so nice. Hence we have name::Task if there is only one task around.