rename and correct mistakes