Changed widget names

:)