(Menu) Reduce namespace conflicts