File names are now in appropriately named variables