Simplify task signal
Fix function names