diff --git a/src/bin/d2/bundy_d2_controller.cc b/src/bin/d2/bundy_d2_controller.cc
index 98bd8c78995efbbf56cc7498a18b7c35f56ec714..62b0746d18370ea4344de45422f28cb65bab9598 100644
--- a/src/bin/d2/bundy_d2_controller.cc
+++ b/src/bin/d2/bundy_d2_controller.cc
@@ -177,11 +177,11 @@ D2Controller::establishSession() {
     LOG_DEBUG(dctl_logger, DBGLVL_START_SHUT, DCTL_CCSESSION_STARTING)
               .arg(getAppName()).arg(getSpecFileName());
 
-    // Create the BIND10 command control session with the our IOService.
+    // Create the Bundy command control session with the our IOService.
     cc_session_ = SessionPtr(new isc::cc::Session(
                              getIOService()->get_io_service()));
 
-    // Create the BIND10 config session with the stub configuration handler.
+    // Create the Bundy config session with the stub configuration handler.
     // This handler is internally invoked by the constructor and on success
     // the constructor updates the current session with the configuration that
     // had been committed in the previous session. If we do not install
@@ -219,12 +219,12 @@ void D2Controller::disconnectSession() {
     LOG_DEBUG(dctl_logger, DBGLVL_START_SHUT, DCTL_CCSESSION_ENDING)
               .arg(getAppName());
 
-    // Destroy the BIND10 config session.
+    // Destroy the Bundy config session.
     if (config_session_) {
         config_session_.reset();
     }
 
-    // Destroy the BIND10 command and control session.
+    // Destroy the Bundy command and control session.
     if (cc_session_) {
         cc_session_->disconnect();
         cc_session_.reset();
diff --git a/src/bin/d2/bundy_d2_controller.h b/src/bin/d2/bundy_d2_controller.h
index 7de0599391469709a119b31b9b9ded55d52e853e..0c8831da20b52bec30bd7b5adefb6801daa73cdc 100644
--- a/src/bin/d2/bundy_d2_controller.h
+++ b/src/bin/d2/bundy_d2_controller.h
@@ -98,7 +98,7 @@ public:
     /// in their main function. Such logger uses environmental variables to
     /// control severity, verbosity etc. Reinitialization of logger by this
     /// function would replace unit tests specific logger configuration with
-    /// this suitable for D2 running as a bind10 module.
+    /// this suitable for D2 running as a Bundy module.
     ///
     /// @param argc  is the number of command line arguments supplied
     /// @param argv  is the array of string (char *) command line arguments
diff --git a/src/bin/d2/d2_config.h b/src/bin/d2/d2_config.h
index b9696d2116e9e41863aa5823489f7a3f02051553..db3b23ad2ab40b83d251d3d162100901f4eeeaf7 100644
--- a/src/bin/d2/d2_config.h
+++ b/src/bin/d2/d2_config.h
@@ -60,7 +60,7 @@ namespace d2 {
 /// that the application can carry out DNS update exchanges with it. Servers
 /// are represented by the class, DnsServerInfo.
 ///
-/// The configuration specification for use with BIND10 is detailed in the file
+/// The configuration specification for use with Kea is detailed in the file
 /// dhcp-ddns.spec.
 ///
 /// The parsing class hierarchy reflects this same scheme.  Working top down:
diff --git a/src/bin/d2/d2_messages.mes b/src/bin/d2/d2_messages.mes
index 258f97d27536639b6ce806eace4867d77e31b2d9..883919731e54737d3231b1165bcbefd467e1e533 100644
--- a/src/bin/d2/d2_messages.mes
+++ b/src/bin/d2/d2_messages.mes
@@ -54,7 +54,7 @@ events is called.  This only happens during initial startup.
 A debug message indicating that the controller has received an
 updated configuration from the Kea configuration system.
 
-% DCTL_DISCONNECT_FAIL %1 controller failed to end session with Kea: %2
+% DCTL_DISCONNECT_FAIL %1 controller failed to end session with Bundy: %2
 This message indicates that while shutting down, the DHCP-DDNS controller
 encountered an error terminating communication with the Kea configuration
 system. The service will still exit.  While theoretically possible,
diff --git a/src/bin/d2/d2_process.cc b/src/bin/d2/d2_process.cc
index fba58435f09d7dee113a3d1f8faab3846db1f40e..c31dc674e02cb83f6bd34e26de0109daba146c3f 100644
--- a/src/bin/d2/d2_process.cc
+++ b/src/bin/d2/d2_process.cc
@@ -209,7 +209,7 @@ D2Process::configure(isc::data::ConstElementPtr config_set) {
     if (rcode) {
         // Non-zero means we got an invalid configuration, take no further
         // action. In integrated mode, this will send a failed response back
-        // to BIND10.
+        // to the configuration backend.
         reconf_queue_flag_ = false;
         return (answer);
     }
diff --git a/src/bin/d2/main.cc b/src/bin/d2/main.cc
index 808c613ea3aa962fd9d63ab7af185e8f91a56a18..aea38eb72947502c6d05cdc28d4eaeea6121f253 100644
--- a/src/bin/d2/main.cc
+++ b/src/bin/d2/main.cc
@@ -25,7 +25,7 @@ using namespace isc::d2;
 using namespace std;
 
 /// This file contains entry point (main() function) for standard DHCP-DDNS
-/// process, kea-dhcp-ddns, component for BIND10 framework.  It fetches
+/// process, kea-dhcp-ddns, component of Kea software suite.  It fetches
 /// the D2Controller singleton instance and invokes its launch method.
 /// The exit value of the program will be EXIT_SUCCESS if there were no
 /// errors, EXIT_FAILURE otherwise.
diff --git a/src/bin/d2/tests/bundy_d2_controller_unittests.cc b/src/bin/d2/tests/bundy_d2_controller_unittests.cc
index 5035a34db79575e92d0ab91461ba2127fadc18df..e43ebff9fbb0fb442a8f34e0eab060784131e49c 100644
--- a/src/bin/d2/tests/bundy_d2_controller_unittests.cc
+++ b/src/bin/d2/tests/bundy_d2_controller_unittests.cc
@@ -176,8 +176,8 @@ TEST_F(BundyD2ControllerTest, executeCommandTests) {
 
 /// @brief Tests launch with a session establishment failure.
 /// This test launches with a valid command line for integrated mode and no.
-/// Attempting to connect to BIND10 should fail, even if BIND10 is running
-/// UNLESS the test is run as root.  Launch should throw SessionStartError.
+/// Attempting to connect to Bundy should fail, even if Bundy is running
+/// UNLESS the test is run as root. Launch should throw SessionStartError.
 TEST_F(BundyD2ControllerTest, launchSessionFailure) {
     // Command line to run integrated
     char* argv[] = { (char*)"progName" };
diff --git a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
index a20f372d81dc8794562ce94aea6cfec023690f16..ec1c666cc5f113b92c321f1b7075a4d020411c13 100644
--- a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
@@ -184,7 +184,7 @@ public:
 };
 
 /// @brief Tests that the spec file is valid.
-/// Verifies that the BIND10 DHCP-DDNS configuration specification file
+/// Verifies that the DHCP-DDNS configuration specification file
 //  is valid.
 TEST(D2SpecTest, basicSpec) {
     ASSERT_NO_THROW(isc::config::
diff --git a/src/bin/d2/tests/d_test_stubs.h b/src/bin/d2/tests/d_test_stubs.h
index 30229fb20d7c060749d31a128dd8d4172b157240..b01c249b66e34f8f272ee9bfd7b7af2acdcfa598 100644
--- a/src/bin/d2/tests/d_test_stubs.h
+++ b/src/bin/d2/tests/d_test_stubs.h
@@ -192,8 +192,8 @@ public:
 /// without polluting production derivations (e.g. D2Process).  It uses
 /// DStubProcess as its application process class.  It is a full enough
 /// implementation to support running both stand alone and integrated.
-/// Obviously BIND10 connectivity is not available under unit tests, so
-/// testing here is limited to "failures" to communicate with BIND10.
+/// Obviously Bundy connectivity is not available under unit tests, so
+/// testing here is limited to "failures" to communicate with Bundy.
 class DStubController : public DControllerBase {
 public:
     /// @brief Static singleton instance method. This method returns the
diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc
index 592bf342e01e545705237ae21687e5fb345d0b65..4839d0fe83d548dcd3fd0f9bab120494db3bda64 100644
--- a/src/bin/dhcp4/main.cc
+++ b/src/bin/dhcp4/main.cc
@@ -27,7 +27,7 @@ using namespace isc::dhcp;
 using namespace std;
 
 /// This file contains entry point (main() function) for standard DHCPv4 server
-/// component for BIND10 framework. It parses command-line arguments and
+/// component for Kea software suite. It parses command-line arguments and
 /// instantiates ControlledDhcpv4Srv class that is responsible for establishing
 /// connection with msgq (receiving commands and configuration) and also
 /// creating Dhcpv4 server object as well.
diff --git a/src/bin/dhcp4/tests/callout_library_common.h b/src/bin/dhcp4/tests/callout_library_common.h
index 6db761dcc2a1213ab758b248381b1ccf3f6cc67c..3fb0b5cc489d22932abef95cc8864805dc3e0596 100644
--- a/src/bin/dhcp4/tests/callout_library_common.h
+++ b/src/bin/dhcp4/tests/callout_library_common.h
@@ -63,7 +63,7 @@ appendDigit(const char* name) {
 // Framework functions
 int
 version() {
-    return (BIND10_HOOKS_VERSION);
+    return (KEA_HOOKS_VERSION);
 }
 
 int
diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index 16ef9487f4d16710d764833e1fc2241748247cfb..ca4559adc401c4f61b8be0dc65a76d041dbde365 100644
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -63,8 +63,7 @@ std::string specfile(const std::string& name) {
 }
 
 /// @brief Tests that the spec file is valid.
-/// Verifies that the BIND10 DHCP-DDNS configuration specification file
-//  is valid.
+/// Verifies that the Kea DHCPv4 configuration specification file is valid.
 TEST(Dhcp4SpecTest, basicSpec) {
     (isc::config::moduleSpecFromFile(specfile("dhcp4.spec")));
     ASSERT_NO_THROW(isc::config::moduleSpecFromFile(specfile("dhcp4.spec")));
diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc
index 6bda818adabfac7266289f463f211e3ef666ece3..19ede1037388b911fc7d318c2fc506c2c7dcecdb 100644
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@ -251,7 +251,7 @@ TEST_F(JSONFileBackendTest, configBroken) {
 ///
 /// @todo: Unfortunately, we have this test disabled, because all loaded
 /// configs use memfile, which attempts to create lease file in
-/// /usr/local/var/bind10/kea-leases4.csv. We have couple options here:
+/// /usr/local/var/kea/kea-leases4.csv. We have couple options here:
 /// a) disable persistence in example configs - a very bad thing to do
 ///    as users will forget to reenable it and then will be surprised when their
 ///    leases disappear
diff --git a/src/bin/dhcp6/main.cc b/src/bin/dhcp6/main.cc
index f491ee04be858f327ee428df88cf70c3eea0056c..5b770f23f543469e8dd18f5d76855057b6c57b3e 100644
--- a/src/bin/dhcp6/main.cc
+++ b/src/bin/dhcp6/main.cc
@@ -28,7 +28,7 @@ using namespace isc::dhcp;
 using namespace std;
 
 /// This file contains entry point (main() function) for standard DHCPv6 server
-/// component for BIND10 framework. It parses command-line arguments and
+/// component for Kea software suite. It parses command-line arguments and
 /// instantiates ControlledDhcpv6Srv class that is responsible for establishing
 /// connection with msgq (receiving commands and configuration) and also
 /// creating Dhcpv6 server object as well.
@@ -118,16 +118,16 @@ main(int argc, char* argv[]) {
         ControlledDhcpv6Srv server(port_number);
 
         try {
-            // Initialize the server, i.e. establish control session
-            // if BIND10 backend is used or read a configuration file
+            // Initialize the server, e.g. establish control session
+            // if Bundy backend is used or read a configuration file
             // if Kea backend is used.
             server.init(config_file);
 
         } catch (const std::exception& ex) {
             LOG_ERROR(dhcp6_logger, DHCP6_INIT_FAIL).arg(ex.what());
 
-            // We should not continue if were told to configure (either read
-            // config file or establish BIND10 control session).
+            // We should not continue, just flush whatever has been logged
+            // and exit.
             isc::log::LoggerManager log_manager;
             log_manager.process();
 
diff --git a/src/bin/dhcp6/tests/callout_library_common.h b/src/bin/dhcp6/tests/callout_library_common.h
index 6db761dcc2a1213ab758b248381b1ccf3f6cc67c..3fb0b5cc489d22932abef95cc8864805dc3e0596 100644
--- a/src/bin/dhcp6/tests/callout_library_common.h
+++ b/src/bin/dhcp6/tests/callout_library_common.h
@@ -63,7 +63,7 @@ appendDigit(const char* name) {
 // Framework functions
 int
 version() {
-    return (BIND10_HOOKS_VERSION);
+    return (KEA_HOOKS_VERSION);
 }
 
 int
diff --git a/src/hooks/dhcp/user_chk/version.cc b/src/hooks/dhcp/user_chk/version.cc
index eaa9d507465a140d6ead568bb6ebf4bde792da9b..60babf405727b14149c307ce2864f10592e4a8db 100644
--- a/src/hooks/dhcp/user_chk/version.cc
+++ b/src/hooks/dhcp/user_chk/version.cc
@@ -19,7 +19,7 @@ extern "C" {
 
 /// @brief Version function required by Hooks API for compatibility checks.
 int version() {
-    return (BIND10_HOOKS_VERSION);
+    return (KEA_HOOKS_VERSION);
 }
 
 }
diff --git a/src/lib/asiodns/tests/dns_server_unittest.cc b/src/lib/asiodns/tests/dns_server_unittest.cc
index b2fff3ea5b2ff340ad5d5d4e2e841a1b9b1a9e7b..0620694e49bd804bb74efd499ee670cfed9203a4 100644
--- a/src/lib/asiodns/tests/dns_server_unittest.cc
+++ b/src/lib/asiodns/tests/dns_server_unittest.cc
@@ -80,7 +80,7 @@ const int server_port = 5553;
 const char* const server_port_str = "5553";
 //message client send to udp server, which isn't dns package
 //just for simple testing
-const char* const query_message = "BIND10 is awesome";
+const char* const query_message = "Kea is awesome";
 
 // \brief provide capacity to derived class the ability
 // to stop DNSServer at certain point
@@ -649,7 +649,7 @@ TYPED_TEST(DNSServerTest, TCPNoTimeout) {
     this->tcp_client_->setSendDataDelay(1);
     this->testStopServerByStopper(*this->tcp_server_, this->tcp_client_,
                                   this->tcp_client_);
-    EXPECT_EQ("BIND10 is awesome", this->tcp_client_->getReceivedData());
+    EXPECT_EQ("Kea is awesome", this->tcp_client_->getReceivedData());
     EXPECT_TRUE(this->serverStopSucceed());
 }
 
diff --git a/src/lib/cc/proto_defs.h b/src/lib/cc/proto_defs.h
index d4f18ec40e0254e989b9c8447bb2705bc12e4f5b..d7fac8d79e55c3615ee4b71f42a91abd7b2c462a 100644
--- a/src/lib/cc/proto_defs.h
+++ b/src/lib/cc/proto_defs.h
@@ -16,8 +16,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef BIND10_COMMON_DEFS_H
-#define BIND10_COMMON_DEFS_H
+#ifndef KEA_COMMON_DEFS_H
+#define KEA_COMMON_DEFS_H
 
 // \file proto_defs.h
 // \brief Common shared constants
diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc
index 0a2f11d575aca0f03ced09abec203801e5a70ed6..f2d0f231354d53c48d64f4f6ae68c5ea6c79403b 100644
--- a/src/lib/cc/session.cc
+++ b/src/lib/cc/session.cc
@@ -309,10 +309,10 @@ public:
 void
 Session::establish(const char* socket_file) {
     if (socket_file == NULL) {
-        socket_file = getenv("BIND10_MSGQ_SOCKET_FILE");
+        socket_file = getenv("BUNDY_MSGQ_SOCKET_FILE");
     }
     if (socket_file == NULL) {
-        socket_file = BIND10_MSGQ_SOCKET_FILE;
+        socket_file = BUNDY_MSGQ_SOCKET_FILE;
     }
 
     impl_->establish(*socket_file);
diff --git a/src/lib/cc/session_config.h.pre.in b/src/lib/cc/session_config.h.pre.in
index 96bcba09011733cf6cb3cab72d951eae499a70d9..60eb7ac444d73eb3dcb2131bfba674fc55c5d25b 100644
--- a/src/lib/cc/session_config.h.pre.in
+++ b/src/lib/cc/session_config.h.pre.in
@@ -1,2 +1,2 @@
-#define BIND10_MSGQ_SOCKET_FILE "@@LOCALSTATEDIR@@/@PACKAGE@/msgq_socket"
+#define BUNDY_MSGQ_SOCKET_FILE "@@LOCALSTATEDIR@@/@PACKAGE@/msgq_socket"
 
diff --git a/src/lib/cc/tests/session_unittests.cc b/src/lib/cc/tests/session_unittests.cc
index 2531ce164032c2e17ac9014152e852a3b3e5e1a2..e3546d28462875c71b7dd3bc378f446889f4975b 100644
--- a/src/lib/cc/tests/session_unittests.cc
+++ b/src/lib/cc/tests/session_unittests.cc
@@ -84,7 +84,7 @@ public:
 
     ~TestDomainSocket() {
         socket_.close();
-        unlink(BIND10_TEST_SOCKET_FILE);
+        unlink(BUNDY_TEST_SOCKET_FILE);
     }
 
     void acceptHandler(const asio::error_code&) const {
@@ -165,8 +165,8 @@ protected:
     SessionTest() : sess(my_io_service), work(my_io_service) {
         // The TestDomainSocket is held as a 'new'-ed pointer,
         // so we can call unlink() first.
-        unlink(BIND10_TEST_SOCKET_FILE);
-        tds = new TestDomainSocket(my_io_service, BIND10_TEST_SOCKET_FILE);
+        unlink(BUNDY_TEST_SOCKET_FILE);
+        tds = new TestDomainSocket(my_io_service, BUNDY_TEST_SOCKET_FILE);
     }
 
     ~SessionTest() {
@@ -226,25 +226,25 @@ TEST_F(SessionTest, timeout_on_connect) {
     sess.setTimeout(100);
     EXPECT_EQ(100, sess.getTimeout());
     // no answer, should timeout
-    EXPECT_THROW(sess.establish(BIND10_TEST_SOCKET_FILE), SessionTimeout);
+    EXPECT_THROW(sess.establish(BUNDY_TEST_SOCKET_FILE), SessionTimeout);
 }
 
 TEST_F(SessionTest, connect_ok) {
     tds->setSendLname();
-    sess.establish(BIND10_TEST_SOCKET_FILE);
+    sess.establish(BUNDY_TEST_SOCKET_FILE);
 }
 
 TEST_F(SessionTest, connect_ok_no_timeout) {
     tds->setSendLname();
 
     sess.setTimeout(0);
-    sess.establish(BIND10_TEST_SOCKET_FILE);
+    sess.establish(BUNDY_TEST_SOCKET_FILE);
 }
 
 TEST_F(SessionTest, connect_ok_connection_reset) {
     tds->setSendLname();
 
-    sess.establish(BIND10_TEST_SOCKET_FILE);
+    sess.establish(BUNDY_TEST_SOCKET_FILE);
     // Close the session again, so the next recv() should throw
     sess.disconnect();
 
@@ -255,7 +255,7 @@ TEST_F(SessionTest, connect_ok_connection_reset) {
 TEST_F(SessionTest, run_with_handler) {
     tds->setSendLname();
 
-    sess.establish(BIND10_TEST_SOCKET_FILE);
+    sess.establish(BUNDY_TEST_SOCKET_FILE);
     sess.startRead(boost::bind(&SessionTest::someHandler, this));
 
     isc::data::ElementPtr env = isc::data::Element::fromJSON("{ \"to\": \"me\" }");
@@ -279,7 +279,7 @@ TEST_F(SessionTest, run_with_handler) {
 TEST_F(SessionTest, run_with_handler_timeout) {
     tds->setSendLname();
 
-    sess.establish(BIND10_TEST_SOCKET_FILE);
+    sess.establish(BUNDY_TEST_SOCKET_FILE);
     sess.startRead(boost::bind(&SessionTest::someHandler, this));
     sess.setTimeout(100);
 
@@ -299,7 +299,7 @@ TEST_F(SessionTest, run_with_handler_timeout) {
 
 TEST_F(SessionTest, get_socket_descr) {
     tds->setSendLname();
-    sess.establish(BIND10_TEST_SOCKET_FILE);
+    sess.establish(BUNDY_TEST_SOCKET_FILE);
 
     int socket = 0;
     // session is established, so getSocketDesc() should work
@@ -313,7 +313,7 @@ TEST_F(SessionTest, get_socket_descr) {
 TEST_F(SessionTest, group_sendmsg) {
     // Connect (to set the lname, so we can see it sets the from)
     tds->setSendLname();
-    sess.establish(BIND10_TEST_SOCKET_FILE);
+    sess.establish(BUNDY_TEST_SOCKET_FILE);
     // Eat the "get_lname" message, so it doesn't confuse the
     // test below.
     sess.getSentMessage();
diff --git a/src/lib/cc/tests/session_unittests_config.h.in b/src/lib/cc/tests/session_unittests_config.h.in
index e4b7dd73650d53d73101d3c708643d971eddcd51..9157d83e141f615a5dd1fc6a552ae6a89e426263 100644
--- a/src/lib/cc/tests/session_unittests_config.h.in
+++ b/src/lib/cc/tests/session_unittests_config.h.in
@@ -1,2 +1,2 @@
-#define BIND10_TEST_SOCKET_FILE "@builddir@/test_socket.sock"
+#define BUNDY_TEST_SOCKET_FILE "@builddir@/test_socket.sock"
 
diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc
index 641b87586237647a4a848879ba92e0c8142984b2..2b0cd4c0ed011b35a10f5a14b2d2b211251a3f4d 100644
--- a/src/lib/dhcp/tests/iface_mgr_unittest.cc
+++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc
@@ -1198,7 +1198,7 @@ TEST_F(IfaceMgrTest, sendReceive4) {
 // @todo: This part of the test is currently disabled on all BSD systems as it was
 // the quick fix. We need a more elegant (config-based) solution to disable
 // this check on affected systems only. The ticket has been submited for this
-// work: http://bind10.isc.org/ticket/2971
+// work: http://kea.isc.org/ticket/2971
 #ifndef OS_BSD
     EXPECT_THROW(ifacemgr->receive4(10), SocketReadError);
 #endif
diff --git a/src/lib/dhcpsrv/addr_utilities.h b/src/lib/dhcpsrv/addr_utilities.h
index 6aef574c611bc4ffd6f4d883e5d266f55b2c9039..2cc6ea51feaddb5836fbf77d0850cbbdfc80cc7e 100644
--- a/src/lib/dhcpsrv/addr_utilities.h
+++ b/src/lib/dhcpsrv/addr_utilities.h
@@ -22,7 +22,7 @@ namespace dhcp {
 
 /// This code is based on similar code from the Dibbler project. I, Tomasz Mrugalski,
 /// as a sole creator of that code hereby release it under BSD license for the benefit
-/// of the BIND10 project.
+/// of the Kea project.
 
 /// @brief returns a first address in a given prefix
 ///
diff --git a/src/lib/dhcpsrv/csv_lease_file4.h b/src/lib/dhcpsrv/csv_lease_file4.h
index fc13ea238956b3034fc99debbc7bd73f3d35dc79..57862f659dcb45cdfe560d87c8a020b468d588f3 100644
--- a/src/lib/dhcpsrv/csv_lease_file4.h
+++ b/src/lib/dhcpsrv/csv_lease_file4.h
@@ -35,7 +35,7 @@ namespace dhcp {
 ///
 /// @todo This class doesn't validate the lease values read from the file.
 /// The @c Lease4 is a structure that should be itself responsible for this
-/// validation (see http://bind10.isc.org/ticket/2405). However, when #2405
+/// validation (see http://kea.isc.org/ticket/2405). However, when #2405
 /// is implemented, the @c next function may need to be updated to use the
 /// validation capablity of @c Lease4.
 class CSVLeaseFile4 : public isc::util::CSVFile {
@@ -75,7 +75,7 @@ public:
     ///
     /// @todo Make sure that the values read from the file are correct.
     /// The appropriate @c Lease4 validation mechanism should be used once
-    /// ticket http://bind10.isc.org/ticket/2405 is implemented.
+    /// ticket http://kea.isc.org/ticket/2405 is implemented.
     bool next(Lease4Ptr& lease);
 
 private:
diff --git a/src/lib/dhcpsrv/csv_lease_file6.h b/src/lib/dhcpsrv/csv_lease_file6.h
index 4e0c595b66a1e9f455bbc9f7f44108d9a340b99a..3cc7bee44a510f6a8b25e5bd1e0fadec75f9ae94 100644
--- a/src/lib/dhcpsrv/csv_lease_file6.h
+++ b/src/lib/dhcpsrv/csv_lease_file6.h
@@ -34,7 +34,7 @@ namespace dhcp {
 ///
 /// @todo This class doesn't validate the lease values read from the file.
 /// The @c Lease6 is a structure that should be itself responsible for this
-/// validation (see http://bind10.isc.org/ticket/2405). However, when #2405
+/// validation (see http://kea.isc.org/ticket/2405). However, when #2405
 /// is implemented, the @c next function may need to be updated to use the
 /// validation capablity of @c Lease6.
 class CSVLeaseFile6 : public isc::util::CSVFile {
@@ -74,7 +74,7 @@ public:
     ///
     /// @todo Make sure that the values read from the file are correct.
     /// The appropriate @c Lease6 validation mechanism should be used once
-    /// ticket http://bind10.isc.org/ticket/2405 is implemented.
+    /// ticket http://kea.isc.org/ticket/2405 is implemented.
     bool next(Lease6Ptr& lease);
 
 private:
diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h
index 32e5349171ed49bf4241dfb9d1a182c419b41693..a25474cd93158750ba0b76f453de966352d9c945 100644
--- a/src/lib/dhcpsrv/memfile_lease_mgr.h
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.h
@@ -66,8 +66,8 @@ namespace dhcp {
 /// parameter in the database access string. The [path] is the
 /// absolute path to the file (including file name). If this parameter
 /// is not specified, the default location in the installation
-/// directory is used: var/bind10/kea-leases4.csv and
-/// var/bind10/kea-leases6.csv.
+/// directory is used: var/kea/kea-leases4.csv and
+/// var/kea/kea-leases6.csv.
 class Memfile_LeaseMgr : public LeaseMgr {
 public:
 
diff --git a/src/lib/dhcpsrv/tests/callout_library.cc b/src/lib/dhcpsrv/tests/callout_library.cc
index 09da3cd43ebfe68cb522a83dd8634522db0933fc..4e3bcfd36abd522b964d1b51932f08bd2d25cde4 100644
--- a/src/lib/dhcpsrv/tests/callout_library.cc
+++ b/src/lib/dhcpsrv/tests/callout_library.cc
@@ -25,7 +25,7 @@ extern "C" {
 // Framework functions
 int
 version() {
-    return (BIND10_HOOKS_VERSION);
+    return (KEA_HOOKS_VERSION);
 }
 
 };
diff --git a/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc b/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
index 11e00655f9fdb17780d0fd1b3a4975938bad2c24..f34110e40cbd077a4aa48136d3979f4f84590c58 100644
--- a/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
@@ -177,6 +177,6 @@ TEST_F(CSVLeaseFile4Test, recreate) {
 /// lease type, invalid preferred lifetime vs valid lifetime etc. The Lease6
 /// should be extended with the function that validates lease attributes. Once
 /// this is implemented we should provide more tests for malformed leases
-/// in the CSV file. See http://bind10.isc.org/ticket/2405.
+/// in the CSV file. See http://kea.isc.org/ticket/2405.
 
 } // end of anonymous namespace
diff --git a/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc b/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
index 40770e4efb4b097003bf658b92eb5335e9ebc6d3..93589706a5abfc6b6572aca7b7e530f48f07c344 100644
--- a/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
+++ b/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
@@ -218,6 +218,6 @@ TEST_F(CSVLeaseFile6Test, recreate) {
 /// lease type, invalid preferred lifetime vs valid lifetime etc. The Lease6
 /// should be extended with the function that validates lease attributes. Once
 /// this is implemented we should provide more tests for malformed leases
-/// in the CSV file. See http://bind10.isc.org/ticket/2405.
+/// in the CSV file. See http://kea.isc.org/ticket/2405.
 
 } // end of anonymous namespace
diff --git a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
index 86d51d8f03e8d9373dd1456c6b2848f1fa0fda08..954139bbb7fc454cdbaa7c1de49fd33d6577fca8 100644
--- a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
@@ -248,7 +248,7 @@ TEST_F(DbAccessParserTest, emptyKeyword) {
 TEST_F(DbAccessParserTest, persistV4Memfile) {
     const char* config[] = {"type", "memfile",
                             "persist", "true",
-                            "name", "/opt/bind10/var/kea-leases4.csv",
+                            "name", "/opt/kea/var/kea-leases4.csv",
                             NULL};
 
     string json_config = toJson(config);
@@ -267,7 +267,7 @@ TEST_F(DbAccessParserTest, persistV4Memfile) {
 TEST_F(DbAccessParserTest, persistV6Memfile) {
     const char* config[] = {"type", "memfile",
                             "persist", "true",
-                            "name", "/opt/bind10/var/kea-leases6.csv",
+                            "name", "/opt/kea/var/kea-leases6.csv",
                             NULL};
 
     string json_config = toJson(config);
diff --git a/src/lib/hooks/hooks.h b/src/lib/hooks/hooks.h
index 42dfaca15fa6f9bedb8a7e93f9a9029b1d44d85f..c15bfd1167c29b3fe5aae9a98d570ffd49a7248e 100644
--- a/src/lib/hooks/hooks.h
+++ b/src/lib/hooks/hooks.h
@@ -22,7 +22,7 @@
 namespace {
 
 // Version 1 of the hooks framework.
-const int BIND10_HOOKS_VERSION = 1;
+const int KEA_HOOKS_VERSION = 1;
 
 // Names of the framework functions.
 const char* const LOAD_FUNCTION_NAME = "load";
diff --git a/src/lib/hooks/library_manager.cc b/src/lib/hooks/library_manager.cc
index 4b04005bb2f76f807458573e622854025ad4089c..7d60fbdc54d8280457d47c83bafd750156d913c1 100644
--- a/src/lib/hooks/library_manager.cc
+++ b/src/lib/hooks/library_manager.cc
@@ -111,7 +111,7 @@ LibraryManager::checkVersion() const {
     // Get the pointer to the "version" function.
     PointerConverter pc(dlsym(dl_handle_, VERSION_FUNCTION_NAME));
     if (pc.versionPtr() != NULL) {
-        int version = BIND10_HOOKS_VERSION - 1; // This is an invalid value
+        int version = KEA_HOOKS_VERSION - 1; // This is an invalid value
         try {
             version = (*pc.versionPtr())();
         } catch (...) {
@@ -119,7 +119,7 @@ LibraryManager::checkVersion() const {
             return (false);
         }
 
-        if (version == BIND10_HOOKS_VERSION) {
+        if (version == KEA_HOOKS_VERSION) {
             // All OK, version checks out
             LOG_DEBUG(hooks_logger, HOOKS_DBG_CALLS, HOOKS_LIBRARY_VERSION)
                       .arg(library_name_).arg(version);
@@ -127,7 +127,7 @@ LibraryManager::checkVersion() const {
 
         } else {
             LOG_ERROR(hooks_logger, HOOKS_INCORRECT_VERSION).arg(library_name_)
-                      .arg(version).arg(BIND10_HOOKS_VERSION);
+                      .arg(version).arg(KEA_HOOKS_VERSION);
         }
     } else {
         LOG_ERROR(hooks_logger, HOOKS_NO_VERSION).arg(library_name_);
diff --git a/src/lib/hooks/tests/basic_callout_library.cc b/src/lib/hooks/tests/basic_callout_library.cc
index 0a81f239c9c409e73eb340c42658e0b485f3b5d5..622ad42b331d92337e7400f04013eed682416794 100644
--- a/src/lib/hooks/tests/basic_callout_library.cc
+++ b/src/lib/hooks/tests/basic_callout_library.cc
@@ -108,7 +108,7 @@ hookpt_three(CalloutHandle& handle) {
 
 int
 version() {
-    return (BIND10_HOOKS_VERSION);
+    return (KEA_HOOKS_VERSION);
 }
 
 // load() initializes the user library if the main image was statically linked.
diff --git a/src/lib/hooks/tests/full_callout_library.cc b/src/lib/hooks/tests/full_callout_library.cc
index 3a87f54643f88ff3b8ec2cb4dee5ab5e5eeabd5f..984909bfd45dfdba5e6e3a30db4d9a0f152cb37e 100644
--- a/src/lib/hooks/tests/full_callout_library.cc
+++ b/src/lib/hooks/tests/full_callout_library.cc
@@ -111,7 +111,7 @@ hook_nonstandard_three(CalloutHandle& handle) {
 
 int
 version() {
-    return (BIND10_HOOKS_VERSION);
+    return (KEA_HOOKS_VERSION);
 }
 
 int
diff --git a/src/lib/hooks/tests/incorrect_version_library.cc b/src/lib/hooks/tests/incorrect_version_library.cc
index bb6eedfa3129b92b0d5b085468d8d1f119a25b0f..76d2b9496b59eae72d3fbe04df36157c1c457709 100644
--- a/src/lib/hooks/tests/incorrect_version_library.cc
+++ b/src/lib/hooks/tests/incorrect_version_library.cc
@@ -27,7 +27,7 @@
 extern "C" {
 
 int version() {
-    return (BIND10_HOOKS_VERSION + 1);
+    return (KEA_HOOKS_VERSION + 1);
 }
 
 };
diff --git a/src/lib/hooks/tests/load_callout_library.cc b/src/lib/hooks/tests/load_callout_library.cc
index 59a58b5c48dc9a8ca36e40f9b16f8be147676156..365773c1b06326fe47c080ca138031aa59b5792b 100644
--- a/src/lib/hooks/tests/load_callout_library.cc
+++ b/src/lib/hooks/tests/load_callout_library.cc
@@ -104,7 +104,7 @@ hook_nonstandard_three(CalloutHandle& handle) {
 
 int
 version() {
-    return (BIND10_HOOKS_VERSION);
+    return (KEA_HOOKS_VERSION);
 }
 
 int load(LibraryHandle& handle) {
diff --git a/src/lib/hooks/tests/load_error_callout_library.cc b/src/lib/hooks/tests/load_error_callout_library.cc
index b861d7ff0b0ec86ff96abb06267b2dfe6224ee50..a42be2b406a47041af984353e396e301a820f520 100644
--- a/src/lib/hooks/tests/load_error_callout_library.cc
+++ b/src/lib/hooks/tests/load_error_callout_library.cc
@@ -32,7 +32,7 @@ extern "C" {
 
 int
 version() {
-    return (BIND10_HOOKS_VERSION);
+    return (KEA_HOOKS_VERSION);
 }
 
 int
diff --git a/src/lib/hooks/tests/unload_callout_library.cc b/src/lib/hooks/tests/unload_callout_library.cc
index 9baa830a2b75798289fe6d626ed8e62d15833484..bcb62fc2796ccde4438cda4778bc823101331211 100644
--- a/src/lib/hooks/tests/unload_callout_library.cc
+++ b/src/lib/hooks/tests/unload_callout_library.cc
@@ -36,7 +36,7 @@ extern "C" {
 
 int
 version() {
-    return (BIND10_HOOKS_VERSION);
+    return (KEA_HOOKS_VERSION);
 }
 
 int
diff --git a/src/lib/log/logger_manager.cc b/src/lib/log/logger_manager.cc
index 047c7dcfffae10e6e4c3a8173ec6cb1c2927488d..114d32effde253663ee1ca4d71f2f1522880ab8c 100644
--- a/src/lib/log/logger_manager.cc
+++ b/src/lib/log/logger_manager.cc
@@ -51,7 +51,7 @@ int& initDebugLevel() {
 }
 
 std::string& initRootName() {
-    static std::string root("bind10");
+    static std::string root("kea");
     return (root);
 }
 
diff --git a/src/lib/log/logger_unittest_support.cc b/src/lib/log/logger_unittest_support.cc
index 9dc90fd020bf9731836f487d8cdfe3fd78d2c37b..d073a2f31a3bfa626ff683bdea13c308cccf2e25 100644
--- a/src/lib/log/logger_unittest_support.cc
+++ b/src/lib/log/logger_unittest_support.cc
@@ -150,9 +150,9 @@ resetUnitTestRootLogger() {
 void initLogger(isc::log::Severity severity, int dbglevel) {
 
     // Root logger name is defined by the environment variable B10_LOGGER_ROOT.
-    // If not present, the name is "bind10".
-    const char* DEFAULT_ROOT = "bind10";
-    const char* root = getenv("B10_LOGGER_ROOT");
+    // If not present, the name is "kea".
+    const char* DEFAULT_ROOT = "kea";
+    const char* root = getenv("KEA_LOGGER_ROOT");
     if (! root) {
         root = DEFAULT_ROOT;
     }
diff --git a/src/lib/log/logger_unittest_support.h b/src/lib/log/logger_unittest_support.h
index 70f34e80b13d9f91e7ee6ce003147fc984a8cf89..28baa5ca004e90a4d1ea94e4c83f0e1da960e3cb 100644
--- a/src/lib/log/logger_unittest_support.h
+++ b/src/lib/log/logger_unittest_support.h
@@ -34,7 +34,7 @@ namespace log {
 /// environment variables.  These are:
 ///
 /// - B10_LOGGER_ROOT\n
-/// Name of the root logger.  If not given, the string "bind10" will be used.
+/// Name of the root logger.  If not given, the string "kea" will be used.
 ///
 /// - B10_LOGGER_SEVERITY\n
 /// Severity of messages that will be logged.  This must be one of the strings
diff --git a/src/lib/log/tests/init_logger_test.sh.in b/src/lib/log/tests/init_logger_test.sh.in
index 58c268ab5318837239dfbb41fce9b41455e1922e..eef521dda30d4b04c4d5dcbc22fa440dec86a918 100755
--- a/src/lib/log/tests/init_logger_test.sh.in
+++ b/src/lib/log/tests/init_logger_test.sh.in
@@ -37,13 +37,13 @@ echo "1. Checking that B10_LOGGER_SEVERITY/B10_LOGGER_DBGLEVEL work"
 
 echo -n  "   - severity=DEBUG, dbglevel=99: "
 cat > $tempfile << .
-DEBUG [bind10.log] LOG_BAD_DESTINATION unrecognized log destination: debug-0
-DEBUG [bind10.log] LOG_BAD_DESTINATION unrecognized log destination: debug-50
-DEBUG [bind10.log] LOG_BAD_DESTINATION unrecognized log destination: debug-99
-INFO  [bind10.log] LOG_BAD_SEVERITY unrecognized log severity: info
-WARN  [bind10.log] LOG_BAD_STREAM bad log console output stream: warn
-ERROR [bind10.log] LOG_DUPLICATE_MESSAGE_ID duplicate message ID (error) in compiled code
-FATAL [bind10.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
+DEBUG [kea.log] LOG_BAD_DESTINATION unrecognized log destination: debug-0
+DEBUG [kea.log] LOG_BAD_DESTINATION unrecognized log destination: debug-50
+DEBUG [kea.log] LOG_BAD_DESTINATION unrecognized log destination: debug-99
+INFO  [kea.log] LOG_BAD_SEVERITY unrecognized log severity: info
+WARN  [kea.log] LOG_BAD_STREAM bad log console output stream: warn
+ERROR [kea.log] LOG_DUPLICATE_MESSAGE_ID duplicate message ID (error) in compiled code
+FATAL [kea.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
 .
 B10_LOGGER_DESTINATION=stdout B10_LOGGER_SEVERITY=DEBUG B10_LOGGER_DBGLEVEL=99 ./init_logger_test | \
     sed -e 's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/' | \
@@ -52,12 +52,12 @@ passfail $?
 
 echo -n  "   - severity=DEBUG, dbglevel=50: "
 cat > $tempfile << .
-DEBUG [bind10.log] LOG_BAD_DESTINATION unrecognized log destination: debug-0
-DEBUG [bind10.log] LOG_BAD_DESTINATION unrecognized log destination: debug-50
-INFO  [bind10.log] LOG_BAD_SEVERITY unrecognized log severity: info
-WARN  [bind10.log] LOG_BAD_STREAM bad log console output stream: warn
-ERROR [bind10.log] LOG_DUPLICATE_MESSAGE_ID duplicate message ID (error) in compiled code
-FATAL [bind10.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
+DEBUG [kea.log] LOG_BAD_DESTINATION unrecognized log destination: debug-0
+DEBUG [kea.log] LOG_BAD_DESTINATION unrecognized log destination: debug-50
+INFO  [kea.log] LOG_BAD_SEVERITY unrecognized log severity: info
+WARN  [kea.log] LOG_BAD_STREAM bad log console output stream: warn
+ERROR [kea.log] LOG_DUPLICATE_MESSAGE_ID duplicate message ID (error) in compiled code
+FATAL [kea.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
 .
 B10_LOGGER_DESTINATION=stdout B10_LOGGER_SEVERITY=DEBUG B10_LOGGER_DBGLEVEL=50 ./init_logger_test | \
     sed -e 's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/' | \
@@ -66,9 +66,9 @@ passfail $?
 
 echo -n  "   - severity=WARN: "
 cat > $tempfile << .
-WARN  [bind10.log] LOG_BAD_STREAM bad log console output stream: warn
-ERROR [bind10.log] LOG_DUPLICATE_MESSAGE_ID duplicate message ID (error) in compiled code
-FATAL [bind10.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
+WARN  [kea.log] LOG_BAD_STREAM bad log console output stream: warn
+ERROR [kea.log] LOG_DUPLICATE_MESSAGE_ID duplicate message ID (error) in compiled code
+FATAL [kea.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
 .
 B10_LOGGER_DESTINATION=stdout B10_LOGGER_SEVERITY=WARN ./init_logger_test | \
     sed -e 's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/' | \
@@ -79,7 +79,7 @@ echo "2. Checking that B10_LOGGER_DESTINATION works"
 
 echo -n  "   - stdout: "
 cat > $tempfile << .
-FATAL [bind10.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
+FATAL [kea.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
 .
 rm -f $destfile_tmp $destfile
 B10_LOGGER_SEVERITY=FATAL B10_LOGGER_DESTINATION=stdout ./init_logger_test 1> $destfile_tmp
diff --git a/src/lib/log/tests/logger_lock_test.sh.in b/src/lib/log/tests/logger_lock_test.sh.in
index 147998cdd4886d5372f445065aaffc48bb858951..19a6a4fd526702319dd2c6529a51e3ca859f15b2 100755
--- a/src/lib/log/tests/logger_lock_test.sh.in
+++ b/src/lib/log/tests/logger_lock_test.sh.in
@@ -33,7 +33,7 @@ echo -n  "Testing that logger acquires and releases locks correctly:"
 cat > $tempfile << .
 LOGGER_LOCK_TEST: MUTEXLOCK
 LOGGER_LOCK_TEST: LOCK
-INFO  [bind10.log] LOG_LOCK_TEST_MESSAGE this is a test message.
+INFO  [kea.log] LOG_LOCK_TEST_MESSAGE this is a test message.
 LOGGER_LOCK_TEST: UNLOCK
 .
 rm -f $destfile
diff --git a/src/lib/log/tests/logger_manager_unittest.cc b/src/lib/log/tests/logger_manager_unittest.cc
index 90f890453289021b1c560d3d934c6a75cfaf3214..95e660ea9895ae75513ca40b97fe2421772a2f54 100644
--- a/src/lib/log/tests/logger_manager_unittest.cc
+++ b/src/lib/log/tests/logger_manager_unittest.cc
@@ -114,7 +114,7 @@ public:
     //
     // \return Temporary file name
     std::string createTempFilename() {
-        string filename = TEMP_DIR + "/bind10_logger_manager_test_XXXXXX";
+        string filename = TEMP_DIR + "/kea_logger_manager_test_XXXXXX";
 
         // Copy into writeable storage for the call to mkstemp
         boost::scoped_array<char> tname(new char[filename.size() + 1]);
diff --git a/src/lib/util/buffer.h b/src/lib/util/buffer.h
index 4aac11e0ae4d5ca2c343a7d7d19f4ae16bd8c042..fd0908889e8ed54b890816e7112eed37e9347aea 100644
--- a/src/lib/util/buffer.h
+++ b/src/lib/util/buffer.h
@@ -46,7 +46,7 @@ public:
 ///
 /// Applications normally use this class only in a limited situation: as an
 /// interface between legacy I/O operation (such as receiving data from a BSD
-/// socket) and the rest of the BIND10 DNS library.  One common usage of this
+/// socket) and the rest of the Kea DNS library.  One common usage of this
 /// class for an application would therefore be something like this:
 ///
 /// \code unsigned char buf[1024];
@@ -56,7 +56,7 @@ public:
 /// InputBuffer buffer(buf, cc);
 /// // pass the buffer to a DNS message object to parse the message \endcode
 ///
-/// Other BIND10 DNS classes will then use methods of this class to get access
+/// Other Kea DNS classes will then use methods of this class to get access
 /// to the data, but the application normally doesn't have to care about the
 /// details.
 ///
diff --git a/src/lib/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
index e83c140cdce0a3056cccaffb7268517ae7b3a62c..3e96915a9292da57c0c07a843003f9a5708b08eb 100644
--- a/src/lib/util/tests/socketsession_unittest.cc
+++ b/src/lib/util/tests/socketsession_unittest.cc
@@ -54,7 +54,7 @@ namespace {
 const char* const TEST_UNIX_FILE = TEST_DATA_TOPBUILDDIR "/test.unix";
 const char* const TEST_PORT = "53535";
 const char* const TEST_PORT2 = "53536"; // use this in case we need 2 ports
-const char TEST_DATA[] = "BIND10 test";
+const char TEST_DATA[] = "Kea test";
 
 // A simple helper structure to automatically close test sockets on return
 // or exception in a RAII manner.  non copyable to prevent duplicate close.