renamed drive and folder to drive_name and folder_name
renamed ImportPbcoreDatastream filename to filenames (for clarity)