Issue #3553592: Rename the entity-related classes

Closes #3553592

Merge request reports

Loading