Renamed menu classes