Fix resource names not being unique