CLOUD-216 fixed names