Renamed *Widget to *,
depracted old names.