More consistent naming, using simplified accessor.