Rename identifiers that have become keywords

It compiles with rustc 0.12.0-dev.