clean up with renaming