cleaned up nomenclature and naming conversion for tasks module