Fix name error and reordering tasks