#73 Renaming some stuff for batch downloading