Rename rects to widgets