modify some bug make by rename