more tweaks to overridden global name
fix up jsdoc comments so doctrine does not choke