Final naming cleanup

Cleanup of all the task names.

@doudou namings should be now consistent
Not sure if we have a convention for this i decided to keep the name for "main" task.
If you could figure out that we have a rule for this i can change this..., wo waiting for you reply for to change this or your okay to merge