rename and some fix