[TIDOC-1370] Fix syntax and grammar