Edited some more parameter names to make them consistent