[#927036]Refactor userbar code to no longer mention "butter"