Downloader and renamer improvements