Merge pull request #4084 from nutty898/master_nutty_modifyfilenames

Master nutty modifyfilenames