[CLC-2098] Casing changes