Cleanup resource names