CLOUD-135 fixed naming