Mostly superficial, but in case of file name collisions we want the mod-specific files to override the common ones. (cherry picked from commit f210b39bbc)
f210b39bbc