changed FileName to SafeFileName, so the format of the file is also included