#371 changing class names