Fixed the widget names