fix category naming, e.g., consistently use singular