renaming parameters for more consistent api