Renamed some parameters, so that the parameters’ names are the same with the... See merge request !13