Rename x -> oldX and y -> oldY