fix some bugs regarding the naming