BS-2279
Do not reset expression return type when refactoring widget name