fix some name problem