fix #273
Class naming refactoring