proper handling of reserved identifiers

9 files changed