VID-1586 Change to camel casing