Proper rename and cleanup