Merge "Rename getName API to be getUniqueIdentifier" into main