Issue #2371227: fix the variable names as og menu single has been fixed