Update MenuBarFilter for new naming conventions
Merge pull request #1583 from Cottser/menubarfilter

Update MenuBarFilter for new naming conventions