instead of a single '_' to follow the current patch naming guidelines.
patches to several appropriately named single-file patches. Requested by: flz