Tidy up resource naming.