rename and cleanup