unify names of *Catalog classes: type now always in singular

Merge request reports

Loading