simplification and renaming of catalog classes

Merge request reports

Loading