fix some bugs due to the changes of names