CLC-1648 Normalize case on some fields