Fix #15 Rename reserved words