Change name of claim params to avoid clash in specs