CLOUDIFY-2149 naming changes