Change download arg to download_id. CLoses #1663