Merge "Rename task classes to be more consistent."
Xavier Ducrohet [Fri, 31 Aug 2012 20:11:18 +0000 (13:11 -0700)]

Trivial merge