rename and clean-up