CLOUDIFY-2392 fixed name conventions