[Core] Fix some reserved identifiers
Merge pull request #1 from lfxgroove/reserved-identifiers

[Core] Fix some reserved identifiers