changed to singular class names