Bundle names fixes, base widget fixes, other widgets fixes