converted from plural to singular (names of class files in entities)