Minor improvement to avoid symbol conflicts
This tag has no release notes.