update mapping to work with general file names