The runtime and management libraries may not always have identical ordering, so use the device UUID to correlate instead of ID.
Cleaning up go package naming