More consistent naming of exposed data