I wrote that patch, and I agree with everything you've written here, including the rename.
This has been working for me, but it is not essential. Feel free to change it to Mod4 -- I'm sorry for the problem, thanks for finding it!