[Core] Fix some more reserved identifiers
Merge pull request #217 from lfxgroove/more-reserved-identifiers-2

[Core] Fix some more reserved identifiers