menu module: renamed some mixins and arguments