More clear menu naming convention.