Use singular in class names