[Core] Fix some more reserved identifiers