Fixed downloading, extraction and renaming