really fix naming collision
Merge pull request #3 from queckezz/fix/naming-collision

really fix naming collision