diff --git a/src/lib/dhcpsrv/memfile_lease_limits.cc b/src/lib/dhcpsrv/memfile_lease_limits.cc
index 714cec58b6..9cb349a6ff 100644
--- a/src/lib/dhcpsrv/memfile_lease_limits.cc
+++ b/src/lib/dhcpsrv/memfile_lease_limits.cc
@@ -58,7 +58,7 @@ ClassLeaseCounter::getLeaseClientClasses(LeasePtr lease) const {
     ConstElementPtr classes;
     auto ctx = lease->getContext();
     if (ctx) {
-        classes = ctx->find("ISC/classes");
+        classes = ctx->find("ISC/client-classes");
         if (classes && classes->getType() != Element::list) {
             isc_throw(Unexpected, "getLeaseClientClasses: "
                       << lease->toText() << " is not a list!");
@@ -116,7 +116,7 @@ ClassLeaseCounter::updateLease(LeasePtr new_lease, LeasePtr old_lease) {
     uint32_t old_state = old_lease->state_;
 
     // Did we change states or classes?
-    // Note we do not worry about lease type changes, because its makes no
+    // Note we do not worry about lease type changes, because it makes no
     // business sense to repurpose a lease as a different type. Other than
     // some unit tests unrelated to this it never occurs in the code.
     if ((old_state != new_state) || (old_classes != new_classes)) {
diff --git a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
index 9dde6c3b12..b42828b682 100644
--- a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
@@ -4015,9 +4015,9 @@ GenericLeaseMgrTest::makeContextWithClasses(const std::list<ClientClass>& classe
             clist->add(Element::create(client_class));
         }
 
-        ElementPtr extended_info = Element::createMap();
-        extended_info->set("classes", clist);
-        ctx->set("ISC", extended_info);
+        ElementPtr client_classes = Element::createMap();
+        client_classes->set("client-classes", clist);
+        ctx->set("ISC", client_classes);
     }
 
     return (ctx);
diff --git a/src/lib/dhcpsrv/tests/memfile_lease_limits_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_limits_unittest.cc
index 8c17b69984..648294e6d8 100644
--- a/src/lib/dhcpsrv/tests/memfile_lease_limits_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_limits_unittest.cc
@@ -48,7 +48,7 @@ public:
     ///
     /// {
     ///     "ISC": {
-    ///         "classes": [ "class0", "class1", ... ]
+    ///         "client-classes": [ "class0", "class1", ... ]
     ///     }
     /// }
     ///
@@ -62,9 +62,9 @@ public:
                 clist->add(Element::create(client_class));
             }
 
-            ElementPtr extended_info = Element::createMap();
-            extended_info->set("classes", clist);
-            ctx->set("ISC", extended_info);
+            ElementPtr client_classes = Element::createMap();
+            client_classes->set("client-classes", clist);
+            ctx->set("ISC", client_classes);
         }
 
         return (ctx);