diff --git a/configure.ac b/configure.ac
index 4b8df8532e928881bbb1dedbd436830c3e4b7941..34842bb8d2fa1ee1950e31f54e981f00aa842041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1601,7 +1601,7 @@ AC_CONFIG_FILES([compatcheck/Makefile
                  src/bin/Makefile
                  src/bin/agent/Makefile
                  src/bin/agent/tests/Makefile
-                 src/bin/agent/tests/ctrl_agent_process_tests.sh
+                 src/bin/agent/tests/ca_process_tests.sh
                  src/bin/d2/Makefile
                  src/bin/d2/tests/Makefile
                  src/bin/d2/tests/d2_process_tests.sh
diff --git a/src/bin/agent/.gitignore b/src/bin/agent/.gitignore
index 076c41267fde8247b9249194327c5d69ccd547cf..c24184cb91876be43c97dec3dfb09917abb4abf0 100644
--- a/src/bin/agent/.gitignore
+++ b/src/bin/agent/.gitignore
@@ -1,6 +1,6 @@
 /kea-ctrl-agent
-/ctrl_agent_messages.cc
-/ctrl_agent_messages.h
+/ca_messages.cc
+/ca_messages.h
 /s-messages
 /kea-ctrl-agent.8
 
diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index 94f23b724afd6e797ee99bd151904769a781bc24..8dabee60861731c88df476977cf74a8758e1ab3e 100644
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -9,7 +9,7 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
-CLEANFILES  = *.gcno *.gcda ctrl_agent_messages.h ctrl_agent_messages.cc s-messages
+CLEANFILES  = *.gcno *.gcda ca_messages.h ca_messages.cc s-messages
 
 man_MANS = kea-ctrl-agent.8
 DISTCLEANFILES = $(man_MANS)
@@ -29,13 +29,13 @@ $(man_MANS):
 
 endif
 
-ctrl_agent_messages.h ctrl_agent_messages.cc: s-messages
+ca_messages.h ca_messages.cc: s-messages
 
-s-messages: ctrl_agent_messages.mes
-	$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/agent/ctrl_agent_messages.mes
+s-messages: ca_messages.mes
+	$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/agent/ca_messages.mes
 	touch $@
 
-BUILT_SOURCES = ctrl_agent_messages.h ctrl_agent_messages.cc
+BUILT_SOURCES = ca_messages.h ca_messages.cc
 
 
 # convenience archive
@@ -44,17 +44,17 @@ noinst_LTLIBRARIES = libagent.la
 
 libagent_la_SOURCES  = agent_parser.cc agent_parser.h
 libagent_la_SOURCES += agent_lexer.cc
-libagent_la_SOURCES += ctrl_agent_cfg_mgr.cc ctrl_agent_cfg_mgr.h
-libagent_la_SOURCES += ctrl_agent_controller.cc ctrl_agent_controller.h
-libagent_la_SOURCES += ctrl_agent_command_mgr.cc ctrl_agent_command_mgr.h
-libagent_la_SOURCES += ctrl_agent_log.cc ctrl_agent_log.h
-libagent_la_SOURCES += ctrl_agent_process.cc ctrl_agent_process.h
-libagent_la_SOURCES += ctrl_agent_response_creator.cc ctrl_agent_response_creator.h
-libagent_la_SOURCES += ctrl_agent_response_creator_factory.h
+libagent_la_SOURCES += ca_cfg_mgr.cc ca_cfg_mgr.h
+libagent_la_SOURCES += ca_controller.cc ca_controller.h
+libagent_la_SOURCES += ca_command_mgr.cc ca_command_mgr.h
+libagent_la_SOURCES += ca_log.cc ca_log.h
+libagent_la_SOURCES += ca_process.cc ca_process.h
+libagent_la_SOURCES += ca_response_creator.cc ca_response_creator.h
+libagent_la_SOURCES += ca_response_creator_factory.h
 libagent_la_SOURCES += parser_context.cc parser_context.h parser_context_decl.h
 
-nodist_libagent_la_SOURCES = ctrl_agent_messages.h ctrl_agent_messages.cc
-EXTRA_DIST += ctrl_agent_messages.mes
+nodist_libagent_la_SOURCES = ca_messages.h ca_messages.cc
+EXTRA_DIST += ca_messages.mes
 EXTRA_DIST += agent_lexer.ll
 EXTRA_DIST += agent_parser.yy
 
diff --git a/src/bin/agent/ctrl_agent_cfg_mgr.cc b/src/bin/agent/ca_cfg_mgr.cc
similarity index 91%
rename from src/bin/agent/ctrl_agent_cfg_mgr.cc
rename to src/bin/agent/ca_cfg_mgr.cc
index 87f9f0c87ca856490803fabec4c6862d959c6c0c..22db555ec673767e09ec6f8b0f5b2dbaacb0873e 100644
--- a/src/bin/agent/ctrl_agent_cfg_mgr.cc
+++ b/src/bin/agent/ca_cfg_mgr.cc
@@ -1,11 +1,11 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <agent/ctrl_agent_cfg_mgr.h>
+#include <agent/ca_cfg_mgr.h>
 
 using namespace isc::dhcp;
 using namespace isc::process;
diff --git a/src/bin/agent/ctrl_agent_cfg_mgr.h b/src/bin/agent/ca_cfg_mgr.h
similarity index 100%
rename from src/bin/agent/ctrl_agent_cfg_mgr.h
rename to src/bin/agent/ca_cfg_mgr.h
diff --git a/src/bin/agent/ctrl_agent_command_mgr.cc b/src/bin/agent/ca_command_mgr.cc
similarity index 96%
rename from src/bin/agent/ctrl_agent_command_mgr.cc
rename to src/bin/agent/ca_command_mgr.cc
index 8c89fccf024401a8ac15c1d197eddd0d78db99af..5a36d8e9543bc27d575be2fa035452172dec4e4e 100644
--- a/src/bin/agent/ctrl_agent_command_mgr.cc
+++ b/src/bin/agent/ca_command_mgr.cc
@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <agent/ctrl_agent_command_mgr.h>
+#include <agent/ca_command_mgr.h>
 #include <cc/data.h>
 #include <boost/pointer_cast.hpp>
 
diff --git a/src/bin/agent/ctrl_agent_command_mgr.h b/src/bin/agent/ca_command_mgr.h
similarity index 100%
rename from src/bin/agent/ctrl_agent_command_mgr.h
rename to src/bin/agent/ca_command_mgr.h
diff --git a/src/bin/agent/ctrl_agent_controller.cc b/src/bin/agent/ca_controller.cc
similarity index 95%
rename from src/bin/agent/ctrl_agent_controller.cc
rename to src/bin/agent/ca_controller.cc
index 04845686a33352863d7eae27bf75b282bafd1830..a5508abdb7eeeeaa2a3fe4aed092005dce0ce4db 100644
--- a/src/bin/agent/ctrl_agent_controller.cc
+++ b/src/bin/agent/ca_controller.cc
@@ -6,8 +6,8 @@
 
 #include <config.h>
 
-#include <agent/ctrl_agent_controller.h>
-#include <agent/ctrl_agent_process.h>
+#include <agent/ca_controller.h>
+#include <agent/ca_process.h>
 
 using namespace isc::process;
 
diff --git a/src/bin/agent/ctrl_agent_controller.h b/src/bin/agent/ca_controller.h
similarity index 100%
rename from src/bin/agent/ctrl_agent_controller.h
rename to src/bin/agent/ca_controller.h
diff --git a/src/bin/agent/ctrl_agent_log.cc b/src/bin/agent/ca_log.cc
similarity index 77%
rename from src/bin/agent/ctrl_agent_log.cc
rename to src/bin/agent/ca_log.cc
index ed2eef615672da8c8895349d5eb3599e75764ce9..7c9147c8b3a553e33df47541a4e94b9bab23ba12 100644
--- a/src/bin/agent/ctrl_agent_log.cc
+++ b/src/bin/agent/ca_log.cc
@@ -1,10 +1,10 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <agent/ctrl_agent_log.h>
+#include <agent/ca_log.h>
 
 namespace isc {
 namespace agent {
diff --git a/src/bin/agent/ctrl_agent_log.h b/src/bin/agent/ca_log.h
similarity index 82%
rename from src/bin/agent/ctrl_agent_log.h
rename to src/bin/agent/ca_log.h
index a62998c0c9920255f8ca65e58f6a170d9730a1e1..f9d77eb86a02af7b381be0512df2c614f4539b4b 100644
--- a/src/bin/agent/ctrl_agent_log.h
+++ b/src/bin/agent/ca_log.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,7 +9,7 @@
 
 #include <log/logger_support.h>
 #include <log/macros.h>
-#include <agent/ctrl_agent_messages.h>
+#include <agent/ca_messages.h>
 
 namespace isc {
 namespace agent {
diff --git a/src/bin/agent/ctrl_agent_messages.mes b/src/bin/agent/ca_messages.mes
similarity index 100%
rename from src/bin/agent/ctrl_agent_messages.mes
rename to src/bin/agent/ca_messages.mes
diff --git a/src/bin/agent/ctrl_agent_process.cc b/src/bin/agent/ca_process.cc
similarity index 96%
rename from src/bin/agent/ctrl_agent_process.cc
rename to src/bin/agent/ca_process.cc
index 651e670151d63c67ac3aad3fe642db5debabb3ab..9a632e3c1878996610c1a556c7a393ccc0819283 100644
--- a/src/bin/agent/ctrl_agent_process.cc
+++ b/src/bin/agent/ca_process.cc
@@ -5,9 +5,9 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <agent/ctrl_agent_process.h>
-#include <agent/ctrl_agent_response_creator_factory.h>
-#include <agent/ctrl_agent_log.h>
+#include <agent/ca_process.h>
+#include <agent/ca_response_creator_factory.h>
+#include <agent/ca_log.h>
 #include <asiolink/io_address.h>
 #include <cc/command_interpreter.h>
 #include <http/listener.h>
diff --git a/src/bin/agent/ctrl_agent_process.h b/src/bin/agent/ca_process.h
similarity index 97%
rename from src/bin/agent/ctrl_agent_process.h
rename to src/bin/agent/ca_process.h
index 05f54c30c730e1125c2dbf477cb7832de84f553b..a8516315a658b5e9b870386bfbffff216fc26cce 100644
--- a/src/bin/agent/ctrl_agent_process.h
+++ b/src/bin/agent/ca_process.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,7 +7,7 @@
 #ifndef CTRL_AGENT_PROCESS_H
 #define CTRL_AGENT_PROCESS_H
 
-#include <agent/ctrl_agent_cfg_mgr.h>
+#include <agent/ca_cfg_mgr.h>
 #include <process/d_process.h>
 
 namespace isc {
diff --git a/src/bin/agent/ctrl_agent_response_creator.cc b/src/bin/agent/ca_response_creator.cc
similarity index 97%
rename from src/bin/agent/ctrl_agent_response_creator.cc
rename to src/bin/agent/ca_response_creator.cc
index 5b11e069b57685b436567517cb2e37881663ce80..0f6d782b8fca414e6867cb0664e2e7c2d52ded5b 100644
--- a/src/bin/agent/ctrl_agent_response_creator.cc
+++ b/src/bin/agent/ca_response_creator.cc
@@ -4,8 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <agent/ctrl_agent_command_mgr.h>
-#include <agent/ctrl_agent_response_creator.h>
+#include <agent/ca_command_mgr.h>
+#include <agent/ca_response_creator.h>
 #include <cc/data.h>
 #include <http/post_request_json.h>
 #include <http/response_json.h>
diff --git a/src/bin/agent/ctrl_agent_response_creator.h b/src/bin/agent/ca_response_creator.h
similarity index 98%
rename from src/bin/agent/ctrl_agent_response_creator.h
rename to src/bin/agent/ca_response_creator.h
index 610b3fc3858053e3147a1de509e478bb7a6ee08d..cde253ff79905486ecb2081b9528c76f63b7a052 100644
--- a/src/bin/agent/ctrl_agent_response_creator.h
+++ b/src/bin/agent/ca_response_creator.h
@@ -7,7 +7,7 @@
 #ifndef CTRL_AGENT_RESPONSE_CREATOR_H
 #define CTRL_AGENT_RESPONSE_CREATOR_H
 
-#include <agent/ctrl_agent_command_mgr.h>
+#include <agent/ca_command_mgr.h>
 #include <http/response_creator.h>
 #include <boost/shared_ptr.hpp>
 
diff --git a/src/bin/agent/ctrl_agent_response_creator_factory.h b/src/bin/agent/ca_response_creator_factory.h
similarity index 97%
rename from src/bin/agent/ctrl_agent_response_creator_factory.h
rename to src/bin/agent/ca_response_creator_factory.h
index d6f6ba05688f4a2c5248a9b73d1ba7660ee6a59b..5949fae2fe9d2e136ca9ff26e8d3540421df13b2 100644
--- a/src/bin/agent/ctrl_agent_response_creator_factory.h
+++ b/src/bin/agent/ca_response_creator_factory.h
@@ -7,7 +7,7 @@
 #ifndef CTRL_AGENT_RESPONSE_CREATOR_FACTORY_H
 #define CTRL_AGENT_RESPONSE_CREATOR_FACTORY_H
 
-#include <agent/ctrl_agent_response_creator.h>
+#include <agent/ca_response_creator.h>
 #include <http/response_creator_factory.h>
 
 namespace isc {
diff --git a/src/bin/agent/main.cc b/src/bin/agent/main.cc
index 999a4d15372b91ca7c2c3c0e585d3cc65ac88295..c74329ba128a6385809494499ff365e969fbcd8d 100644
--- a/src/bin/agent/main.cc
+++ b/src/bin/agent/main.cc
@@ -1,11 +1,11 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <agent/ctrl_agent_controller.h>
+#include <agent/ca_controller.h>
 #include <exceptions/exceptions.h>
 #include <cstdlib>
 #include <iostream>
diff --git a/src/bin/agent/tests/.gitignore b/src/bin/agent/tests/.gitignore
index b0a8f7b157f6e99ddccb7b7fdf9ce7fc8e8547f3..81d3cbd5ceb3c0f83c255e04627219672e190d70 100644
--- a/src/bin/agent/tests/.gitignore
+++ b/src/bin/agent/tests/.gitignore
@@ -1,2 +1,2 @@
-/ctrl_agent_unittest
-/ctrl_agent_process_tests.sh
+/ca_unittests
+/ca_process_tests.sh
diff --git a/src/bin/agent/tests/Makefile.am b/src/bin/agent/tests/Makefile.am
index b9ae35b9f1f3c0e0e93024fea582f8dd60190934..34e9b005ba1bb98182214ce143c339512fcc4bc7 100644
--- a/src/bin/agent/tests/Makefile.am
+++ b/src/bin/agent/tests/Makefile.am
@@ -1,11 +1,11 @@
 SHTESTS =
 # The test of dynamic reconfiguration based on signals will work only
 # if we are using file based configuration approach.
-SHTESTS += ctrl_agent_process_tests.sh
+SHTESTS += ca_process_tests.sh
 
-noinst_SCRIPTS = ctrl_agent_process_tests.sh
+noinst_SCRIPTS = ca_process_tests.sh
 
-EXTRA_DIST  = ctrl_agent_process_tests.sh.in
+EXTRA_DIST  = ca_process_tests.sh.in
 
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
@@ -26,7 +26,7 @@ AM_CPPFLAGS += -DCFG_EXAMPLES=\"$(abs_top_srcdir)/doc/examples/agent\"
 
 CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile
 
-DISTCLEANFILES = ctrl_agent_process_tests.sh
+DISTCLEANFILES = ca_process_tests.sh
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
@@ -40,43 +40,43 @@ TESTS_ENVIRONMENT = \
 TESTS =
 if HAVE_GTEST
 
-TESTS += ctrl_agent_unittest
-
-ctrl_agent_unittest_SOURCES  = ctrl_agent_cfg_mgr_unittest.cc
-ctrl_agent_unittest_SOURCES += ctrl_agent_command_mgr_unittest.cc
-ctrl_agent_unittest_SOURCES += ctrl_agent_controller_unittest.cc
-ctrl_agent_unittest_SOURCES += ctrl_agent_process_unittest.cc
-ctrl_agent_unittest_SOURCES += ctrl_agent_response_creator_unittest.cc
-ctrl_agent_unittest_SOURCES += ctrl_agent_response_creator_factory_unittest.cc
-ctrl_agent_unittest_SOURCES += ctrl_agent_unittest.cc
-ctrl_agent_unittest_SOURCES += parser_unittest.cc
-
-ctrl_agent_unittest_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-ctrl_agent_unittest_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
-
-ctrl_agent_unittest_LDADD = $(top_builddir)/src/bin/agent/libagent.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/process/testutils/libprocesstest.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-ctrl_agent_unittest_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-ctrl_agent_unittest_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
-ctrl_agent_unittest_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
+TESTS += ca_unittests
+
+ca_unittests_SOURCES  = ca_cfg_mgr_unittests.cc
+ca_unittests_SOURCES += ca_command_mgr_unittests.cc
+ca_unittests_SOURCES += ca_controller_unittests.cc
+ca_unittests_SOURCES += ca_process_unittests.cc
+ca_unittests_SOURCES += ca_response_creator_unittests.cc
+ca_unittests_SOURCES += ca_response_creator_factory_unittests.cc
+ca_unittests_SOURCES += ca_unittests.cc
+ca_unittests_SOURCES += parser_unittests.cc
+
+ca_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+ca_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
+
+ca_unittests_LDADD = $(top_builddir)/src/bin/agent/libagent.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/process/testutils/libprocesstest.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+ca_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+ca_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
+ca_unittests_LDADD += $(BOOST_LIBS) $(GTEST_LDADD)
 
 endif
 
diff --git a/src/bin/agent/tests/ctrl_agent_cfg_mgr_unittest.cc b/src/bin/agent/tests/ca_cfg_mgr_unittests.cc
similarity index 90%
rename from src/bin/agent/tests/ctrl_agent_cfg_mgr_unittest.cc
rename to src/bin/agent/tests/ca_cfg_mgr_unittests.cc
index 6e816d8eacc84df5845ef0bc15c90e6b965e18c6..2d11d46ab36b24ca28ed40cdc142000c9e68fab8 100644
--- a/src/bin/agent/tests/ctrl_agent_cfg_mgr_unittest.cc
+++ b/src/bin/agent/tests/ca_cfg_mgr_unittests.cc
@@ -1,11 +1,11 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <agent/ctrl_agent_cfg_mgr.h>
+#include <agent/ca_cfg_mgr.h>
 #include <process/testutils/d_test_stubs.h>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
diff --git a/src/bin/agent/tests/ctrl_agent_command_mgr_unittest.cc b/src/bin/agent/tests/ca_command_mgr_unittests.cc
similarity index 98%
rename from src/bin/agent/tests/ctrl_agent_command_mgr_unittest.cc
rename to src/bin/agent/tests/ca_command_mgr_unittests.cc
index 136d69d44bc130f6a49950c29d1b4a40795d6aac..8061150adcdd0a43d7bc98df89682bec6bc47de3 100644
--- a/src/bin/agent/tests/ctrl_agent_command_mgr_unittest.cc
+++ b/src/bin/agent/tests/ca_command_mgr_unittests.cc
@@ -5,7 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <agent/ctrl_agent_command_mgr.h>
+#include <agent/ca_command_mgr.h>
 #include <cc/command_interpreter.h>
 #include <gtest/gtest.h>
 
diff --git a/src/bin/agent/tests/ctrl_agent_controller_unittest.cc b/src/bin/agent/tests/ca_controller_unittests.cc
similarity index 97%
rename from src/bin/agent/tests/ctrl_agent_controller_unittest.cc
rename to src/bin/agent/tests/ca_controller_unittests.cc
index 7ad86ca7276070fbfe8f771281052a9f62823b02..c8bbc0f4e519b0d6eb61044963be0221850fcd28 100644
--- a/src/bin/agent/tests/ctrl_agent_controller_unittest.cc
+++ b/src/bin/agent/tests/ca_controller_unittests.cc
@@ -1,12 +1,12 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <agent/ctrl_agent_controller.h>
-#include <agent/ctrl_agent_process.h>
+#include <agent/ca_controller.h>
+#include <agent/ca_process.h>
 #include <process/testutils/d_test_stubs.h>
 #include <boost/pointer_cast.hpp>
 
diff --git a/src/bin/agent/tests/ctrl_agent_process_tests.sh.in b/src/bin/agent/tests/ca_process_tests.sh.in
similarity index 100%
rename from src/bin/agent/tests/ctrl_agent_process_tests.sh.in
rename to src/bin/agent/tests/ca_process_tests.sh.in
diff --git a/src/bin/agent/tests/ctrl_agent_process_unittest.cc b/src/bin/agent/tests/ca_process_unittests.cc
similarity index 95%
rename from src/bin/agent/tests/ctrl_agent_process_unittest.cc
rename to src/bin/agent/tests/ca_process_unittests.cc
index 58702bd5bee28a71d00bb9cdc61a3056fc28e93d..417d1e463fe721a744d261cfae633c01aff7977e 100644
--- a/src/bin/agent/tests/ctrl_agent_process_unittest.cc
+++ b/src/bin/agent/tests/ca_process_unittests.cc
@@ -1,12 +1,12 @@
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <agent/ctrl_agent_cfg_mgr.h>
-#include <agent/ctrl_agent_process.h>
+#include <agent/ca_cfg_mgr.h>
+#include <agent/ca_process.h>
 #include <asiolink/interval_timer.h>
 #include <asiolink/io_service.h>
 #include <process/testutils/d_test_stubs.h>
diff --git a/src/bin/agent/tests/ctrl_agent_response_creator_factory_unittest.cc b/src/bin/agent/tests/ca_response_creator_factory_unittests.cc
similarity index 91%
rename from src/bin/agent/tests/ctrl_agent_response_creator_factory_unittest.cc
rename to src/bin/agent/tests/ca_response_creator_factory_unittests.cc
index db975fe223b89b253d74bb576ba4c253b85a4e1e..8cef6fe730cc2a2fe6ef1521b8f69ca22865b0c5 100644
--- a/src/bin/agent/tests/ctrl_agent_response_creator_factory_unittest.cc
+++ b/src/bin/agent/tests/ca_response_creator_factory_unittests.cc
@@ -5,8 +5,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <agent/ctrl_agent_response_creator.h>
-#include <agent/ctrl_agent_response_creator_factory.h>
+#include <agent/ca_response_creator.h>
+#include <agent/ca_response_creator_factory.h>
 #include <boost/pointer_cast.hpp>
 #include <gtest/gtest.h>
 
diff --git a/src/bin/agent/tests/ctrl_agent_response_creator_unittest.cc b/src/bin/agent/tests/ca_response_creator_unittests.cc
similarity index 98%
rename from src/bin/agent/tests/ctrl_agent_response_creator_unittest.cc
rename to src/bin/agent/tests/ca_response_creator_unittests.cc
index ca020feb4329cf67bb604b291e6bb194b55835b2..d4911b38039ea6c40d771ec99cde5ae160da4783 100644
--- a/src/bin/agent/tests/ctrl_agent_response_creator_unittest.cc
+++ b/src/bin/agent/tests/ca_response_creator_unittests.cc
@@ -5,8 +5,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <agent/ctrl_agent_command_mgr.h>
-#include <agent/ctrl_agent_response_creator.h>
+#include <agent/ca_command_mgr.h>
+#include <agent/ca_response_creator.h>
 #include <cc/command_interpreter.h>
 #include <http/post_request.h>
 #include <http/post_request_json.h>
diff --git a/src/bin/agent/tests/ctrl_agent_unittest.cc b/src/bin/agent/tests/ca_unittests.cc
similarity index 100%
rename from src/bin/agent/tests/ctrl_agent_unittest.cc
rename to src/bin/agent/tests/ca_unittests.cc
diff --git a/src/bin/agent/tests/parser_unittest.cc b/src/bin/agent/tests/parser_unittests.cc
similarity index 100%
rename from src/bin/agent/tests/parser_unittest.cc
rename to src/bin/agent/tests/parser_unittests.cc