CFY-1372 tosca naming conventions for cloudify types