Fixed some names

I think it fixes Issue #22