* Potential fix to avoid name clashes
* Release 0.0.6: Fix to avoid name clashes