[Fix Bug 927036] refactor userbar code to no longer mention "butter"

https://bugzilla.mozilla.org/show_bug.cgi?id=927036