Renamed widget base classes