I'd prefer if we avoided duplicating this and .file-name.