names fixes
names fix'es
fix
fix
Merge pull request #34 from twiniars/master

fix