CLOUD-252 renamed classes