work on proper class names