Rename tasks again to prevent import problems