Renamed menu entities.  #46