Fixes inconsistencies in widget naming