Update ClipMenu for new naming conventions
Merge pull request #1556 from Cottser/clipmenu

Update ClipMenu for new naming conventions