CLOUD-290 variables naming fix