more renaming fixes - mostly in the comments; Activities -> Tasks (plural)