(RMenu) Use more sane define names