Rename values that shadow built-in keywords
6 files changed