CAW-5 | Changed unique names and added delete subsite handling