Rename 'query-control'