Cleaner naming of widgets and Builder (#931) modules