diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 1617e1e3e2..8930ea6eb6 100644
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -3206,7 +3206,7 @@ proc_label:BEGIN
             SELECT o.order_index FROM dhcp4_client_class AS c
                 INNER JOIN dhcp4_client_class_order AS o
                     ON c.id = o.class_id
-            WHERE name = follow_class_name
+            WHERE c.name = follow_class_name
         );
         IF follow_class_index IS NULL THEN
             -- The class with a name specified with follow_class_name does
@@ -3666,7 +3666,7 @@ proc_label:BEGIN
             SELECT o.order_index FROM dhcp6_client_class AS c
                 INNER JOIN dhcp6_client_class_order AS o
                     ON c.id = o.class_id
-            WHERE name = follow_class_name
+            WHERE c.name = follow_class_name
         );
         IF follow_class_index IS NULL THEN
             -- The class with a name specified with follow_class_name does
diff --git a/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in b/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in
index 6165635897..b54547d912 100644
--- a/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_9.6_to_10.0.sh.in
@@ -154,7 +154,7 @@ proc_label:BEGIN
             SELECT o.order_index FROM dhcp4_client_class AS c
                 INNER JOIN dhcp4_client_class_order AS o
                     ON c.id = o.class_id
-            WHERE name = follow_class_name
+            WHERE c.name = follow_class_name
         );
         IF follow_class_index IS NULL THEN
             -- The class with a name specified with follow_class_name does
@@ -614,7 +614,7 @@ proc_label:BEGIN
             SELECT o.order_index FROM dhcp6_client_class AS c
                 INNER JOIN dhcp6_client_class_order AS o
                     ON c.id = o.class_id
-            WHERE name = follow_class_name
+            WHERE c.name = follow_class_name
         );
         IF follow_class_index IS NULL THEN
             -- The class with a name specified with follow_class_name does