Make sure that a name is set with the UUID. If a resource does not have a name then we will use a default name type for the resource. Change-Id: If6c4ae03368c5e486bce8ee1e6184695729dec20