CLOUDIFY-2600 rename types