CLOUDIFY-1595 replace _ with -