VIVO-289: fixed capitalization issues