Class naming refactoring, fix #273