Make field names consistent with types.