Changed generic field names