Fixed #958 (since I already had fixed it)

I already had this on my upcoming misc-fixes PR for the refactor branch but apparently it's a problem on the master branch too so I cherry-picked it onto master.

This fixes function name conflicts with Customisable Weaponry and possibly other addons.