Fixed issue #13

Refactoring of class names