Changing class name  convention