Update notes for submitted changes

* More elaborate default handling for FileNameOption