Change query param names to be shorter