Fixed support for new uuid names