Fixes a few more places where we were manually setting the filename.