Updates for naming changes in Chrome and FF.