Issue #48 Changing class name