overhaul of query params' names