fixed plural naming