Changed file_name instances to paths where appropriate