fix field and widget names