Use consistent naming and fix urlParams logic.