Change name and correct some bug