CLC-3215 Fix typo, improve consistency