Fix #8: Consistency in N field names.