Clean up ambiguity between file and filename.