added name or uuid compatibility mode