Rename Activity into Task

Fixes #624