Added a crude way to eliminate name collisions

Hi,

It took some time to understand the codebase and the process in still underway. This change is _little_ crude but seems to work for the time being in reference to issue #109. Please suggest any improvements you see.

@yannickwurm