CORE-3866: fixed a typo and a keyword conflict