*8759* Add context name to task; shorten task names