Close #70
Download code was not updated with new names after refactoring.