Change notation to avoid issues with reserved words