diff --git a/doc/sphinx/arm/hooks-mysql.rst b/doc/sphinx/arm/hooks-mysql.rst
index 7f4864a014..c67464f407 100644
--- a/doc/sphinx/arm/hooks-mysql.rst
+++ b/doc/sphinx/arm/hooks-mysql.rst
@@ -9,6 +9,11 @@ This hook library implements MySQL database storage for:
  - Host Backend
  - Configuration Backend
 
+.. _mysql-configuration-backend:
+
+MySQL Configuration Backend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 This hook library works in conjunction with :ischooklib:`libdhcp_cb_cmds.so` to
 implement the API to create, read, update, and delete (CRUD) the configuration
 in a MySQL database. Please see :ref:`hooks-cb-cmds` for more details.
diff --git a/doc/sphinx/arm/hooks-pgsql.rst b/doc/sphinx/arm/hooks-pgsql.rst
index 6ef2ee7080..3489134d11 100644
--- a/doc/sphinx/arm/hooks-pgsql.rst
+++ b/doc/sphinx/arm/hooks-pgsql.rst
@@ -9,6 +9,11 @@ This hook library implements PostgreSQL database storage for:
  - Host Backend
  - Configuration Backend
 
+.. _pgsql-configuration-backend:
+
+PostgreSQL Configuration Backend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 This hook library works in conjunction with :ischooklib:`libdhcp_cb_cmds.so` to
 implement the API to create, read, update, and delete (CRUD) the configuration
 in a PostgreSQL database. Please see :ref:`hooks-cb-cmds` for more details.
diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index 2b87b77f53..d310a17ebd 100644
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -7378,8 +7378,8 @@ TEST_F(Dhcp4ParserTest, configControlInfoNoFactory) {
     // Should fail because "type=mysql" has no factories.
     configure(config, CONTROL_RESULT_ERROR,
               "during update from config backend database: "
-              "The Kea server has not been compiled with support for database "
-              "type: mysql. Did you forget to use --with-mysql during "
+              "The Kea server has not been compiled with support for configuration "
+              "database type: mysql. Did you forget to use --with-mysql during "
               "compilation or to load libdhcp_mysql hook library?");
 }
 
diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index 464a61d236..3b50a5b573 100644
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -8219,8 +8219,8 @@ TEST_F(Dhcp6ParserTest, configControlInfoNoFactory) {
     // Should fail because "type=mysql" has no factories.
     configure(config, CONTROL_RESULT_ERROR,
               "during update from config backend database: "
-              "The Kea server has not been compiled with support for database "
-              "type: mysql. Did you forget to use --with-mysql during "
+              "The Kea server has not been compiled with support for configuration "
+              "database type: mysql. Did you forget to use --with-mysql during "
               "compilation or to load libdhcp_mysql hook library?");
 }