Avoid name clashing when including modules
Merge pull request #4844 from woboinc/bugfix/avoid_name_clashing

Avoid name clashing when including modules