NXBT-596 - manage all possible filenames