Better handling the names of the widgets.