Fix conflicting import names
Merge pull request #42 from sjoelund/conflicting-import-names

Fix conflicting import names