WIP: Resolve "Renaming of some models"

Closed Nabil Chouika requested to merge 13-renaming-of-some-models into master

Merge request reports