Renames some API classes for consistency - no actual API changes

Merge request reports

Loading