resource names: cleanup