rename tasks, simplify for testing