* Added a simple fix to avoid name clashes
* Added a simple fix to avoid name clashes (II)