VID-1163 Update for coding conventions