Renaming and cleanup