Merge "Unique names for directories management resources"