Fix classes to get rid of warning about overloaded member functions hiding others
This MR gets rid of some warnings about overloaded member functions hiding others.
At the meeting today it was decided how it should be done and this MR implements it this way. It also corrects the changes made in MR !23 (merged) in the same way to be consistent.