rename and fix