Rename menu methods.
Move code.