Change task include file names to be consistent

Mixed use of _ and - in task names is a bit of an eyesore, so settle on
the - version since more were named that way.
Merge pull request #557 from j2sol/fix-names

Change task include file names to be consistent