Rename x/y to w/h for clarity