fix for name changes
allow using uuid