Use consistent naming on tasks