Update MultiBrowser for new naming conventions
Merge pull request #1586 from Cottser/multibrowser

Update MultiBrowser for new naming conventions