Further query param renaming