Fix property name collision with reserved keywords