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

llvm-svn: 216247
3 files changed