Merge pull request #4778 from yutotakano/fix-reserved-identifier-clash-2.16

Backport 2.16: Replace reserved identifier clashes with suitable replacements