Fix key names for singular/plural consistency