fix naming collision. Closes #7