Bug 1014751 - Clean up b2g names in our configs r=bhearsum