updated some parameter names to be consistent