diff --git a/src/nvhttp.cpp b/src/nvhttp.cpp
index fe921c4b7aa..738e7a47688 100644
--- a/src/nvhttp.cpp
+++ b/src/nvhttp.cpp
@@ -114,7 +114,7 @@ namespace nvhttp {
 
   struct named_cert_t {
     std::string name;
-    std::string uniqueID;
+    std::string uuid;
     std::string cert;
   };
 
@@ -197,7 +197,7 @@ namespace nvhttp {
       pt::ptree named_cert_node;
       named_cert_node.put("name"s, named_cert.name);
       named_cert_node.put("cert"s, named_cert.cert);
-      named_cert_node.put("uuid"s, named_cert.uniqueID);
+      named_cert_node.put("uuid"s, named_cert.uuid);
       named_cert_nodes.push_back(std::make_pair(""s, named_cert_node));
     }
     root.add_child("root.named_devices"s, named_cert_nodes);
@@ -251,7 +251,7 @@ namespace nvhttp {
             named_cert_t named_cert;
             named_cert.name = ""s;
             named_cert.cert = el.get_value<std::string>();
-            named_cert.uniqueID = uuid_util::uuid_t::generate().string();
+            named_cert.uuid = uuid_util::uuid_t::generate().string();
             client.named_devices.emplace_back(named_cert);
             client.certs.emplace_back(named_cert.cert);
           }
@@ -264,7 +264,7 @@ namespace nvhttp {
         named_cert_t named_cert;
         named_cert.name = el.get_child("name").get_value<std::string>();
         named_cert.cert = el.get_child("cert").get_value<std::string>();
-        named_cert.uniqueID = el.get_child("uuid").get_value<std::string>();
+        named_cert.uuid = el.get_child("uuid").get_value<std::string>();
         client.named_devices.emplace_back(named_cert);
         client.certs.emplace_back(named_cert.cert);
       }
@@ -624,7 +624,7 @@ namespace nvhttp {
     named_cert_t named_cert;
     named_cert.name = name;
     named_cert.cert = sess.client.cert;
-    named_cert.uniqueID = uuid_util::uuid_t::generate().string();
+    named_cert.uuid = uuid_util::uuid_t::generate().string();
     client.named_devices.emplace_back(named_cert);
 
     // response to the request for pin
@@ -753,7 +753,7 @@ namespace nvhttp {
     for (auto &named_cert : client.named_devices) {
       pt::ptree named_cert_node;
       named_cert_node.put("name"s, named_cert.name);
-      named_cert_node.put("uuid"s, named_cert.uniqueID);
+      named_cert_node.put("uuid"s, named_cert.uuid);
       named_cert_nodes.push_back(std::make_pair(""s, named_cert_node));
     }
 
@@ -1156,11 +1156,11 @@ namespace nvhttp {
    * ```
    */
   int
-  unpair_client(std::string uniqueID) {
+  unpair_client(std::string uuid) {
     int removed = 0;
     client_t &client = client_root;
     for (auto it = client.named_devices.begin(); it != client.named_devices.end();) {
-      if ((*it).uniqueID == uniqueID) {
+      if ((*it).uuid == uuid) {
         // Find matching cert and remove it
         for (auto cert = client.certs.begin(); cert != client.certs.end();) {
           if ((*cert) == (*it).cert) {