Improved the renaming/extracting