rename and make some changes