[Task] Rename ThenTask to ThenWithTaskTask.