Rename and fix