Merge "Rename task classes to be more consistent."