Update for updated names (#BVS-122)
Update for updated names (#BVS-121)
Update for new version (#BVS-119)