Some renaming and menu rearrangements