Fix reserved word validation