Renaming
cleanup after renaming