update mapping file names
merge conflicts