TODO: fix task naming in the factory