Revert "Don't use reserved words"

This reverts commit 7c6c7fef80ad2efedcbc6b9e2e1e587b51220ef6.