Adds download name support more generally.