Fixed retrieval of widget names