Revert "Revert "Ensure the resource name uses the uniquely generated name to avoid conflicts (#1126)" (#1141)"

Revert "Revert "Ensure the resource name uses the uniquely generated name to avoid conflicts (#1126)" (#1141)" #719