Reduce risk of name conflicts

Fixes #4