Issue #4812: add missing underscore prefix to some internal-use-only