Additional renaming and fix renaming after delete condition
Additional renaming and fix renaming after delete condition

Zosoled/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus