Updated naming conventions in MenuSP