CFY-1372 change cloudify types to be compliant with tosca naming convent...

...ions