Bug 957421 - Keep FxA pref names consistent r=markh,rnewman,nalexander