VID-1946 Use consistent quotation marks