Added some file name processing