Use correct names for member types.