rename and clean