Minor changing to method and menu names for testing of new development environment on new machine.
Merge remote-tracking branch 'origin/master'