Improve names, disambiguate accessors

Merge request reports

Loading