Fix stacktrace error
Merge remote-tracking branch 'rt/master'
fixes to make the menu names consistent