renamed widget names to a more generic name