Vid 1582

Renamed these parameters to be more generic