More filename edits