FIX: Use resource_instance_name and resource_collection_name rather than mangling with resource class name