Minor change to map used when generating supporting files

Here's my change. I haven't added any test because I think that would need a little bit of code restructuring and I am not familiar enough with the code for that.