Updating resource names to avoid certain conflicts