fixed some name clashes
Merge branch 'master' of github.com:mbarbos/Wolframe