fix names collision
Merge pull request #27 from AlexanderPavlenko/master

Fix names collision