Fix inconsistencies between doc, menu and code.