Cleaning up resource names