Rename x,y variables