Update parameters

Found a bunch of old params variables still that needed to be updated to work with parameterized class.
Sorry for missing this before.