Refactor model: distribution items

t.knopffrequested to merge
refactor_model into develop

Some minor renaming of functions of the distribution items to be consistent with the function names of other items.

Merge request reports