renamed plural class names to the singular