Out-of-sync file names and file contents #5709

Broken out from #5703, find repro steps there

File name and file contents are not updated at the same time. This is especially noticeable when it takes a long time to load a file. If contents of a file fail to load, the two are out of sync.