[#1656] 1.9.4 release: spelling check

49 files changed, 97 insertions, 97 deletions

diff --git a/src/bin/admin/tests/cql_tests.sh.in b/src/bin/admin/tests/cql_tests.sh.in
index ffb6bfe42e..1827180cd5 100644
--- a/src/bin/admin/tests/cql_tests.sh.in
+++ b/src/bin/admin/tests/cql_tests.sh.in
@@ -401,7 +401,7 @@ cql_unused_subnet_id_test() {
 }
 
 # Verifies that you can upgrade from an earlier version and
-# that all hosts and options from old host_reseravation table (version 3.0) are
+# that all hosts and options from old host_reservation table (version 3.0) are
 # converted to new schema (version 4.0) with new key partition key and are
 # moved to new hosts table
 cql_upgrade_hosts_test() {
diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index a6444078c0..4ed0c18cb3 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -46,7 +46,7 @@ run_statement() {
     qry="$1";shift
     exp_value="${1-}" # Optional value. If not given, replace with empty string.
 
-    # Execute the statment
+    # Execute the statement
     run_command \
         mysql_execute "${qry}"
     value="${OUTPUT}"
@@ -396,7 +396,7 @@ mysql_upgrade_test() {
     count="${OUTPUT}"
     assert_eq 0 "${EXIT_CODE}" "select scope_id from dhcp6_options failed. (expected status code %d, returned %d)"
 
-    #table: DHCPv4 fixed field colums (upgrade 4.1 -> 5.0)
+    #table: DHCPv4 fixed field columns (upgrade 4.1 -> 5.0)
     # verify that hosts table has columns holding values for DHCPv4 fixed fields
     qry="select dhcp4_next_server, dhcp4_server_hostname, dhcp4_boot_file_name, auth_key from hosts";
     run_command \
diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index 090a601c9e..b5b3db1b70 100644
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -46,7 +46,7 @@ run_statement() {
     qry="$1";shift
     exp_value="${1-}" # Optional value. If not given, replace with empty string.
 
-    # Execute the statment
+    # Execute the statement
     run_command \
         pgsql_execute "${qry}"
     value="${OUTPUT}"
diff --git a/src/bin/agent/ca_response_creator.h b/src/bin/agent/ca_response_creator.h
index 189a323b42..e5106e502a 100644
--- a/src/bin/agent/ca_response_creator.h
+++ b/src/bin/agent/ca_response_creator.h
@@ -59,7 +59,7 @@ private:
 
     /// @brief Creates unfinalized stock HTTP response.
     ///
-    /// The unfinilized response is the response that can't be sent over the
+    /// The unfinalized response is the response that can't be sent over the
     /// wire until @c finalize() is called, which commits the contents of the
     /// message body.
     ///
diff --git a/src/bin/agent/tests/ca_cfg_mgr_unittests.cc b/src/bin/agent/tests/ca_cfg_mgr_unittests.cc
index 65c739825a..b83609fb82 100644
--- a/src/bin/agent/tests/ca_cfg_mgr_unittests.cc
+++ b/src/bin/agent/tests/ca_cfg_mgr_unittests.cc
@@ -497,7 +497,7 @@ TEST_F(AgentParserTest, configParseAuth) {
     // Check realm
     EXPECT_EQ("foobar", basic_auth->getRealm());
 
-    // Check credentails
+    // Check credentials
     auto credentials = basic_auth->getCredentialMap();
     EXPECT_EQ(2, credentials.size());
     std::string user;
diff --git a/src/bin/agent/tests/ca_command_mgr_unittests.cc b/src/bin/agent/tests/ca_command_mgr_unittests.cc
index f8429fc9c7..4dd620d9ac 100644
--- a/src/bin/agent/tests/ca_command_mgr_unittests.cc
+++ b/src/bin/agent/tests/ca_command_mgr_unittests.cc
@@ -237,7 +237,7 @@ public:
         ConstElementPtr command = createCommand("foo", service);
         ConstElementPtr answer = mgr_.processCommand(command);
 
-        // Stop IO service immediatelly and let the thread die.
+        // Stop IO service immediately and let the thread die.
         getIOService()->stop();
 
         // Wait for the thread to finish.
@@ -402,7 +402,7 @@ TEST_F(CtrlAgentCommandMgrTest, forwardListCommands) {
     ConstElementPtr answer = mgr_.handleCommand("list-commands", ConstElementPtr(),
                                                 command);
 
-    // Stop IO service immediatelly and let the thread die.
+    // Stop IO service immediately and let the thread die.
     getIOService()->stop();
 
     // Wait for the thread to finish.
diff --git a/src/bin/agent/tests/parser_unittests.cc b/src/bin/agent/tests/parser_unittests.cc
index 96ee8a9f5e..efbd8c5b13 100644
--- a/src/bin/agent/tests/parser_unittests.cc
+++ b/src/bin/agent/tests/parser_unittests.cc
@@ -596,7 +596,7 @@ TEST(ParserTest, errors) {
 
     // unknown keyword
     testError("{ \"Control-agent\":{\n"
-              " \"topping\": \"Mozarella\" }}\n",
+              " \"topping\": \"Mozzarella\" }}\n",
               ParserContext::PARSER_AGENT,
               "<string>:2.2-10: got unexpected keyword "
               "\"topping\" in Control-agent map.");
diff --git a/src/bin/d2/d2_queue_mgr.h b/src/bin/d2/d2_queue_mgr.h
index ccef976b6f..878044956d 100644
--- a/src/bin/d2/d2_queue_mgr.h
+++ b/src/bin/d2/d2_queue_mgr.h
@@ -241,7 +241,7 @@ public:
     /// to the NOT_INITTED state.  This is provided to support reconfiguring
     /// a new listener without losing queued requests.
     ///
-    /// @throw D2QueMgrError if called when the manager state is RUNNING.
+    /// @throw D2QueueMgrError if called when the manager state is RUNNING.
     void removeListener();
 
     /// @brief Returns the number of entries in the queue.
@@ -276,7 +276,7 @@ public:
     ///
     /// @return Pointer reference to the queue entry.
     ///
-    /// @throw D2QueueMgrQueEmpty if there are no entries in the queue.
+    /// @throw D2QueueMgrQueueEmpty if there are no entries in the queue.
     const dhcp_ddns::NameChangeRequestPtr& peek() const;
 
     /// @brief Returns the entry at a given position in the queue.
@@ -302,7 +302,7 @@ public:
 
     /// @brief Removes the entry at the front of the queue.
     ///
-    /// @throw D2QueueMgrQueEmpty if there are no entries in the queue.
+    /// @throw D2QueueMgrQueueEmpty if there are no entries in the queue.
     void dequeue();
 
     /// @brief Adds a request to the end of the queue.
diff --git a/src/bin/d2/tests/d2_command_unittest.cc b/src/bin/d2/tests/d2_command_unittest.cc
index 8452032cd4..7fc8b3d626 100644
--- a/src/bin/d2/tests/d2_command_unittest.cc
+++ b/src/bin/d2/tests/d2_command_unittest.cc
@@ -98,7 +98,7 @@ private:
 
 };
 
-/// @brief Fixture class intended for testin control channel in D2.
+/// @brief Fixture class intended for testing control channel in D2.
 class CtrlChannelD2Test : public ::testing::Test {
 public:
     isc::test::Sandbox sandbox;
diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index c2a3c8934f..03f4765385 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -1061,7 +1061,7 @@ ControlledDhcpv4Srv::ControlledDhcpv4Srv(uint16_t server_port /*= DHCP4_SERVER_P
     // LeaseMgr uses IO service to run asynchronous timers.
     LeaseMgr::setIOService(getIOService());
 
-    // HosrMgr uses IO service to run asynchronous timers.
+    // HostMgr uses IO service to run asynchronous timers.
     HostMgr::setIOService(getIOService());
 
     // These are the commands always supported by the DHCPv4 server.
@@ -1196,7 +1196,7 @@ ControlledDhcpv4Srv::~ControlledDhcpv4Srv() {
         // LeaseMgr uses IO service to run asynchronous timers.
         LeaseMgr::setIOService(IOServicePtr());
 
-        // HosrMgr uses IO service to run asynchronous timers.
+        // HostMgr uses IO service to run asynchronous timers.
         HostMgr::setIOService(IOServicePtr());
     } catch (...) {
         // Don't want to throw exceptions from the destructor. The server
diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
index 8e23f9d1c1..993e986afe 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.h
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -234,7 +234,7 @@ private:
     /// @brief A handler for processing 'dhcp-disable' command.
     ///
     /// @param command command name (ignored).
-    /// @param args aguments for the command. It must be a map and
+    /// @param args arguments for the command. It must be a map and
     /// it may include optional 'max-period' parameter.
     ///
     /// @return result of the command.
diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index 1678f7d49c..a9644d221c 100644
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -1041,7 +1041,7 @@ protected:
     /// @note The only-if-required flag is related because it avoids
     /// double evaluation (which is not forbidden).
     ///
-    /// @param ex The exchange holding needed informations.
+    /// @param ex The exchange holding needed information.
     void requiredClassify(Dhcpv4Exchange& ex);
 
     /// @brief Perform deferred option unpacking.
diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 633a86c230..d36025ebd7 100644
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -118,8 +118,8 @@ public:
     /// @brief Sets global parameters before other parameters are parsed.
     ///
     /// This method sets selected global parameters before other parameters
-    /// are parsed. This is important when the bahavior of the parsers
-    /// run later depends on these global paramters.
+    /// are parsed. This is important when the behavior of the parsers
+    /// run later depends on these global parameters.
     ///
     /// Currently this method sets the following global parameters:
     /// - ip-reservations-unique
diff --git a/src/bin/dhcp4/tests/client_handler_unittest.cc b/src/bin/dhcp4/tests/client_handler_unittest.cc
index 8a578de358..8b992ff4aa 100644
--- a/src/bin/dhcp4/tests/client_handler_unittest.cc
+++ b/src/bin/dhcp4/tests/client_handler_unittest.cc
@@ -71,7 +71,7 @@ public:
 
     /// @brief Check statistics.
     ///
-    /// @param bumped True if pkt4-receive-drop shoud have been bumped by one,
+    /// @param bumped True if pkt4-receive-drop should have been bumped by one,
     /// false otherwise.
     void checkStat(bool bumped) {
         ObservationPtr obs = StatsMgr::instance().getObservation("pkt4-receive-drop");
diff --git a/src/bin/dhcp4/tests/config_backend_unittest.cc b/src/bin/dhcp4/tests/config_backend_unittest.cc
index af0ed0db29..ee19a5f19e 100644
--- a/src/bin/dhcp4/tests/config_backend_unittest.cc
+++ b/src/bin/dhcp4/tests/config_backend_unittest.cc
@@ -74,7 +74,7 @@ protected:
                         }
                     }
 
-                    // Apparently we're looking for one that does not prexist.
+                    // Apparently we're looking for a new one.
                     return (TestConfigBackendDHCPv4Ptr(new TestConfigBackendDHCPv4(params)));
                 });
     }
diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index 88f14a0757..c697a35803 100644
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -7229,7 +7229,7 @@ TEST_F(Dhcp4ParserTest, dhcpQueueControlInvalid) {
     }
 }
 
-// Checks inheritence of calculate-tee-times, t1-perecent, t2-percent
+// Checks inheritence of calculate-tee-times, t1-percent, t2-percent
 TEST_F(Dhcp4ParserTest, calculateTeeTimesInheritence) {
     // Configure the server. This should succeed.
     string config =
diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index bd8cccd2a4..176dff5ed9 100644
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -583,7 +583,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, controlChannelNegative) {
               response);
 }
 
-// Tests that the server properly responds to shtudown command sent
+// Tests that the server properly responds to shutdown command sent
 // via ControlChannel
 TEST_F(CtrlChannelDhcpv4SrvTest, controlChannelShutdown) {
     createUnixChannelServer();
@@ -1290,7 +1290,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, controlLeasesReclaimRemove) {
     ASSERT_FALSE(lease1);
 }
 
-// Tests that the server properly responds to shtudown command sent
+// Tests that the server properly responds to shutdown command sent
 // via ControlChannel
 TEST_F(CtrlChannelDhcpv4SrvTest, listCommands) {
     createUnixChannelServer();
diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index e8cb29565b..ad3bf498dd 100644
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -294,7 +294,7 @@ TEST_F(Dhcpv4SrvTest, adjustIfaceDataUseRouting) {
     IfaceMgr::instance().openSockets4();
 
     // Create configuration for interfaces. It includes the outbound-interface
-    // setting which indicates that the responses aren't neccessarily sent
+    // setting which indicates that the responses aren't necessarily sent
     // over the same interface via which a request has been received, but routing
     // information is used to determine this interface.
     CfgMgr::instance().clear();
@@ -1412,7 +1412,7 @@ TEST_F(Dhcpv4SrvTest, DiscoverTimers) {
     for (auto test = tests.begin(); test != tests.end(); ++test) {
         {
             SCOPED_TRACE((*test).description_);
-            // Configure sunbet's timer values
+            // Configure subnet's timer values
             subnet_->setT1((*test).cfg_t1_);
             subnet_->setT2((*test).cfg_t2_);
 
@@ -1465,9 +1465,9 @@ TEST_F(Dhcpv4SrvTest, calculateTeeTimers) {
         Triplet<uint32_t> cfg_t1_;
         // configured value for subnet's T1
         Triplet<uint32_t> cfg_t2_;
-        // configured value for sunbet's t1_percent.
+        // configured value for subnet's t1_percent.
         double t1_percent_;
-        // configured value for sunbet's t2_percent.
+        // configured value for subnet's t2_percent.
         double t2_percent_;
         // expected value for T1 in server response.
         // A value of 0 means server should not have sent T1.
@@ -1529,7 +1529,7 @@ TEST_F(Dhcpv4SrvTest, calculateTeeTimers) {
     for (auto test = tests.begin(); test != tests.end(); ++test) {
         {
             SCOPED_TRACE((*test).description_);
-            // Configure sunbet's timer values
+            // Configure subnet's timer values
             subnet_->setT1((*test).cfg_t1_);
             subnet_->setT2((*test).cfg_t2_);
 
@@ -3558,7 +3558,7 @@ TEST_F(Dhcpv4SrvTest, clientPoolClassifyUnknown) {
     OptionPtr clientid = generateClientId();
     dis->addOption(clientid);
 
-    // Set harware address / identifier
+    // Set hardware address / identifier
     const HWAddr& hw = HWAddr::fromText("00:00:00:11:22:33");
     HWAddrPtr hw_addr(new HWAddr(hw));
     dis->setHWAddr(hw_addr);
diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index 10d8a3bcd7..228876dfd5 100644
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -685,7 +685,7 @@ Dhcpv4SrvTest::configureWithStatus(const std::string& config, NakedDhcpv4Srv& sr
     try {
         json = parseJSON(config);
     } catch (const std::exception& ex){
-        // Fatal falure on parsing error
+        // Fatal failure on parsing error
 
         std::stringstream tmp;
         tmp << "parsing failure:"
@@ -704,7 +704,7 @@ Dhcpv4SrvTest::configureWithStatus(const std::string& config, NakedDhcpv4Srv& sr
     EXPECT_NO_THROW(status = configureDhcp4Server(srv, json));
     EXPECT_TRUE(status);
     if (!status) {
-        return (make_pair(-1, "configureDhcp4Server didn't return anythin"));
+        return (make_pair(-1, "configureDhcp4Server didn't return anything"));
     }
 
     int rcode;
diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc
index ea3fcd479b..d7c7153e6e 100644
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@ -114,7 +114,7 @@ public:
         }
 
         if (enable_throw_) {
-            isc_throw(Unexpected, "testing if exceptions are corectly handled");
+            isc_throw(Unexpected, "testing if exceptions are correctly handled");
         }
     }
 
@@ -321,7 +321,7 @@ public:
             if (throw_during_fetch) {
                 expected = "{ \"result\": 1, \"text\": ";
                 expected += "\"On demand configuration update failed: ";
-                expected += "testing if exceptions are corectly handled\" }";
+                expected += "testing if exceptions are correctly handled\" }";
             } else {
                 expected = "{ \"result\": 0, \"text\": ";
                 expected += "\"On demand configuration update successful.\" }";
diff --git a/src/bin/dhcp4/tests/shared_network_unittest.cc b/src/bin/dhcp4/tests/shared_network_unittest.cc
index 1a791407df..90b2a67ff3 100644
--- a/src/bin/dhcp4/tests/shared_network_unittest.cc
+++ b/src/bin/dhcp4/tests/shared_network_unittest.cc
@@ -1034,7 +1034,7 @@ public:
     typedef enum AuthoritativeFlag {
         AUTH_DEFAULT, // explicit value not specified (use default)
         AUTH_YES,     // defined explicitly as yes
-        AUTH_NO       // defined explciitly as no
+        AUTH_NO       // defined explicitly as no
     } AuthoritativeFlag;
 
     /// @brief Returns subnet having specified address in range.
@@ -1272,9 +1272,9 @@ public:
     ///   - first subnet: authoritative (subnet1 flag here)
     ///   - second subnet: authoritative (subnet2 flag here)
     ///
-    /// @param global coverns presence/value of global authoritative flag
-    /// @param subnet1 coverns presence/value of authoritative flag in subnet1
-    /// @param subnet2 coverns presence/value of authoritative flag in subnet2
+    /// @param global governs presence/value of global authoritative flag
+    /// @param subnet1 governs presence/value of authoritative flag in subnet1
+    /// @param subnet2 governs presence/value of authoritative flag in subnet2
     string generateAuthConfig(AuthoritativeFlag global, AuthoritativeFlag subnet1,
                               AuthoritativeFlag subnet2) {
         string cfg = "{"
@@ -2010,7 +2010,7 @@ TEST_F(Dhcpv4SharedNetworkTest, matchClientId) {
     ASSERT_TRUE(resp2);
     ASSERT_EQ(DHCPACK, resp2->getType());
 
-    // The lease should get rewnewed.
+    // The lease should get renewed.
     EXPECT_EQ(resp2->getYiaddr().toText(), resp1->getYiaddr().toText());
 }
 
diff --git a/src/bin/dhcp4/tests/vendor_opts_unittest.cc b/src/bin/dhcp4/tests/vendor_opts_unittest.cc
index 10c09e8882..c57f97d9a2 100644
--- a/src/bin/dhcp4/tests/vendor_opts_unittest.cc
+++ b/src/bin/dhcp4/tests/vendor_opts_unittest.cc
@@ -13,7 +13,7 @@
 //               Unfortunately, its definition is blurry, so there are many
 //               similar, but not exact implementations that do things in
 //               different ways.
-// vivco (124) - vendor indepdent vendor class option.
+// vivco (124) - vendor independent vendor class option.
 // class identifier (60) - not exactly vendor specific. It's a string, but the
 //               content of that string identifies what kind of vendor device
 //               this is.
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index 715f5aa70a..7fed6c5c57 100644
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -1080,7 +1080,7 @@ ControlledDhcpv6Srv::ControlledDhcpv6Srv(uint16_t server_port,
     // LeaseMgr uses IO service to run asynchronous timers.
     LeaseMgr::setIOService(getIOService());
 
-    // HosrMgr uses IO service to run asynchronous timers.
+    // HostMgr uses IO service to run asynchronous timers.
     HostMgr::setIOService(getIOService());
 
     // These are the commands always supported by the DHCPv6 server.
@@ -1215,7 +1215,7 @@ ControlledDhcpv6Srv::~ControlledDhcpv6Srv() {
         // LeaseMgr uses IO service to run asynchronous timers.
         LeaseMgr::setIOService(IOServicePtr());
 
-        // HosrMgr uses IO service to run asynchronous timers.
+        // HostMgr uses IO service to run asynchronous timers.
         HostMgr::setIOService(IOServicePtr());
     } catch (...) {
         // Don't want to throw exceptions from the destructor. The server
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
index 85ab579263..d8ab7bd349 100644
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -234,7 +234,7 @@ private:
     /// @brief A handler for processing 'dhcp-disable' command.
     ///
     /// @param command command name (ignored).
-    /// @param args aguments for the command. It must be a map and
+    /// @param args arguments for the command. It must be a map and
     /// it may include optional 'max-period' parameter.
     ///
     /// @return result of the command.
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index d72ef8b948..a89d0504e0 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -859,7 +859,7 @@ protected:
     /// double evaluation (which is not forbidden).
     ///
     /// @param pkt packet to be classified
-    /// @param ctx allocation context where to get informations
+    /// @param ctx allocation context where to get information
     void requiredClassify(const Pkt6Ptr& pkt, AllocEngine::ClientContext6& ctx);
 
     /// @brief Attempts to get a MAC/hardware address using configured sources
diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 943042ca37..8faa100a24 100644
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -206,8 +206,8 @@ public:
     /// @brief Sets global parameters before other parameters are parsed.
     ///
     /// This method sets selected global parameters before other parameters
-    /// are parsed. This is important when the bahavior of the parsers
-    /// run later depends on these global paramters.
+    /// are parsed. This is important when the behavior of the parsers
+    /// run later depends on these global parameters.
     ///
     /// Currently this method sets the following global parameters:
     /// - ip-reservations-unique
diff --git a/src/bin/dhcp6/tests/client_handler_unittest.cc b/src/bin/dhcp6/tests/client_handler_unittest.cc
index aeae1a632d..7d92055c91 100644
--- a/src/bin/dhcp6/tests/client_handler_unittest.cc
+++ b/src/bin/dhcp6/tests/client_handler_unittest.cc
@@ -56,7 +56,7 @@ public:
 
     /// @brief Check statistics.
     ///
-    /// @param bumped True if pkt6-receive-drop shoud have been bumped by one,
+    /// @param bumped True if pkt6-receive-drop should have been bumped by one,
     /// false otherwise.
     void checkStat(bool bumped) {
         ObservationPtr obs = StatsMgr::instance().getObservation("pkt6-receive-drop");
diff --git a/src/bin/dhcp6/tests/config_backend_unittest.cc b/src/bin/dhcp6/tests/config_backend_unittest.cc
index 687a9f4e74..c46521bbf4 100644
--- a/src/bin/dhcp6/tests/config_backend_unittest.cc
+++ b/src/bin/dhcp6/tests/config_backend_unittest.cc
@@ -76,7 +76,7 @@ protected:
                         }
                     }
 
-                    // Apparently we're looking for one that does not prexist.
+                    // Apparently we're looking for a new one.
                     return (TestConfigBackendDHCPv6Ptr(new TestConfigBackendDHCPv6(params)));
                 });
     }
diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index 208b6687e5..e5ceccb78c 100644
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -1509,7 +1509,7 @@ TEST_F(Dhcp6ParserTest, multipleSubnetsExplicitIDs) {
     } while (++cnt < 3);
 }
 
-// CHeck that the configuration with two subnets having the same id is rejected.
+// Check that the configuration with two subnets having the same ID is rejected.
 TEST_F(Dhcp6ParserTest, multipleSubnetsOverlappingIDs) {
     ConstElementPtr x;
     // Four subnets, two of them have the same id.
@@ -6949,7 +6949,7 @@ TEST_F(Dhcp6ParserTest, sharedNetworksDerive) {
     CfgSharedNetworks6Ptr cfg_net = CfgMgr::instance().getStagingCfg()
         ->getCfgSharedNetworks6();
 
-    // Two shared networks are expeced.
+    // Two shared networks are expected.
     ASSERT_TRUE(cfg_net);
     const SharedNetwork6Collection* nets = cfg_net->getAll();
     ASSERT_TRUE(nets);
@@ -7059,7 +7059,7 @@ TEST_F(Dhcp6ParserTest, sharedNetworksDeriveInterfaces) {
     CfgSharedNetworks6Ptr cfg_net = CfgMgr::instance().getStagingCfg()
         ->getCfgSharedNetworks6();
 
-    // Two shared networks are expeced.
+    // Two shared networks are expected.
     ASSERT_TRUE(cfg_net);
     const SharedNetwork6Collection* nets = cfg_net->getAll();
     ASSERT_TRUE(nets);
@@ -7247,7 +7247,7 @@ TEST_F(Dhcp6ParserTest, sharedNetworksRapidCommit) {
     CfgSharedNetworks6Ptr cfg_net = CfgMgr::instance().getStagingCfg()
         ->getCfgSharedNetworks6();
 
-    // Two shared networks are expeced.
+    // Two shared networks are expected.
     ASSERT_TRUE(cfg_net);
     const SharedNetwork6Collection* nets = cfg_net->getAll();
     ASSERT_TRUE(nets);
diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index 2efa23bdb4..ca9f4c981a 100644
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -600,7 +600,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, controlChannelNegative) {
               response);
 }
 
-// Tests that the server properly responds to shtudown command sent
+// Tests that the server properly responds to shutdown command sent
 // via ControlChannel
 TEST_F(CtrlChannelDhcpv6SrvTest, controlChannelShutdown) {
     createUnixChannelServer();
@@ -1319,7 +1319,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, controlChannelStats) {
               response);
 }
 
-// Tests that the server properly responds to shtudown command sent
+// Tests that the server properly responds to shutdown command sent
 // via ControlChannel
 TEST_F(CtrlChannelDhcpv6SrvTest, listCommands) {
     createUnixChannelServer();
diff --git a/src/bin/dhcp6/tests/dhcp6_message_test.h b/src/bin/dhcp6/tests/dhcp6_message_test.h
index 9053d70121..01757f6de7 100644
--- a/src/bin/dhcp6/tests/dhcp6_message_test.h
+++ b/src/bin/dhcp6/tests/dhcp6_message_test.h
@@ -16,7 +16,7 @@ namespace isc {
 namespace dhcp {
 namespace test {
 
-/// @brief Base class for test fixure classes used to validate the DHCPv6
+/// @brief Base class for test fixture classes used to validate the DHCPv6
 /// message processing by the server.
 class Dhcpv6MessageTest : public Dhcpv6SrvTest {
 public:
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 5284cfcf93..f9881a34d4 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -3304,9 +3304,9 @@ TEST_F(Dhcpv6SrvTest, calculateTeeTimers) {
         Triplet<uint32_t> cfg_t2_;
         // whether or not calculation is enabled
         bool calculate_tee_times;
-        // configured value for sunbet's t1_percent.
+        // configured value for subnet's t1_percent.
         double t1_percent_;
-        // configured value for sunbet's t2_percent.
+        // configured value for subnet's t2_percent.
         double t2_percent_;
         // expected value for T1 in server response.
         // A value of 0 means server should not have sent T1.
@@ -3423,7 +3423,7 @@ TEST_F(Dhcpv6SrvTest, calculateTeeTimers) {
     for (auto test = tests.begin(); test != tests.end(); ++test) {
         {
             SCOPED_TRACE((*test).description_);
-            // Configure sunbet for the scenario
+            // Configure subnet for the scenario
             subnet_->setT1((*test).cfg_t1_);
             subnet_->setT2((*test).cfg_t2_);
             subnet_->setCalculateTeeTimes((*test).calculate_tee_times);
diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc
index a3e0a291fc..dc353ba8bd 100644
--- a/src/bin/dhcp6/tests/hooks_unittest.cc
+++ b/src/bin/dhcp6/tests/hooks_unittest.cc
@@ -1713,7 +1713,7 @@ TEST_F(HooksDhcpv6SrvTest, subnet6Select) {
 
 // This test checks if callout installed on subnet6_select hook point can pick
 // a different subnet.
-TEST_F(HooksDhcpv6SrvTest, subnet6SselectChange) {
+TEST_F(HooksDhcpv6SrvTest, subnet6SelectChange) {
 
     // Configure 2 subnets, both directly reachable over local interface
     // (let's not complicate the matter with relays)
diff --git a/src/bin/dhcp6/tests/kea_controller_unittest.cc b/src/bin/dhcp6/tests/kea_controller_unittest.cc
index 696635b9f2..5a24578991 100644
--- a/src/bin/dhcp6/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp6/tests/kea_controller_unittest.cc
@@ -111,7 +111,7 @@ public:
         }
 
         if (enable_throw_) {
-            isc_throw(Unexpected, "testing if exceptions are corectly handled");
+            isc_throw(Unexpected, "testing if exceptions are correctly handled");
         }
     }
 
@@ -308,7 +308,7 @@ public:
             if (throw_during_fetch) {
                 expected = "{ \"result\": 1, \"text\": ";
                 expected += "\"On demand configuration update failed: ";
-                expected += "testing if exceptions are corectly handled\" }";
+                expected += "testing if exceptions are correctly handled\" }";
             } else {
                 expected = "{ \"result\": 0, \"text\": ";
                 expected += "\"On demand configuration update successful.\" }";
diff --git a/src/bin/dhcp6/tests/shared_network_unittest.cc b/src/bin/dhcp6/tests/shared_network_unittest.cc
index 8bd0d26f64..a23aab36cf 100644
--- a/src/bin/dhcp6/tests/shared_network_unittest.cc
+++ b/src/bin/dhcp6/tests/shared_network_unittest.cc
@@ -1366,9 +1366,9 @@ public:
     ///
     /// @param config - text version of the configuration to be tested
     /// @param enabled - true = rapid-commit is expected to work
-    /// @param exp_addr1 - an eddress the first client is expected to get (if
+    /// @param exp_addr1 - an address the first client is expected to get (if
     ///                    rapid-commit is enabled).
-    /// @param exp_addr2 - an eddress the second client is expected to get (if
+    /// @param exp_addr2 - an address the second client is expected to get (if
     ///                    rapid-commit is enabled).
     void testRapidCommit(const std::string& config, bool enabled,
                          const std::string& exp_addr1,
@@ -1552,7 +1552,7 @@ TEST_F(Dhcpv6SharedNetworkTest, addressPoolInSharedNetworkShortage) {
     });
     ASSERT_TRUE(hasLeaseForAddress(client2, IOAddress("2001:db8:2::20")));
 
-    // Cient #3. It sends Solicit which should result in NoAddrsAvail status
+    // Client #3. It sends Solicit which should result in NoAddrsAvail status
     // code because all addresses available for this link have been assigned.
     Dhcp6Client client3(client1.getServer());
     client3.setInterface("eth1");
@@ -2290,7 +2290,7 @@ TEST_F(Dhcpv6SharedNetworkTest, relaySpecifiedForEachSubnet) {
 // Shared network is selected based on interface id.
 TEST_F(Dhcpv6SharedNetworkTest, sharedNetworkSelectedByInterfaceId) {
     // Create client #1. This is a relayed client for which interface id
-    // has been spefified and this interface id is matching the one specified
+    // has been specified and this interface id is matching the one specified
     // for the shared network.
     Dhcp6Client client1;
     client1.useRelay(true, IOAddress("3001::1"));
@@ -2323,7 +2323,7 @@ TEST_F(Dhcpv6SharedNetworkTest, sharedNetworkSelectedByInterfaceId) {
 // belonging to a shared network.
 TEST_F(Dhcpv6SharedNetworkTest, sharedNetworkSelectedByInterfaceIdInSubnet) {
     // Create client #1. This is a relayed client for which interface id
-    // has been spefified and this interface id is matching the one specified
+    // has been specified and this interface id is matching the one specified
     // for the shared network.
     Dhcp6Client client1;
     client1.useRelay(true, IOAddress("3001::1"));
diff --git a/src/bin/dhcp6/tests/tee_times_unittest.cc b/src/bin/dhcp6/tests/tee_times_unittest.cc
index 367433d2d6..c3cb969296 100644
--- a/src/bin/dhcp6/tests/tee_times_unittest.cc
+++ b/src/bin/dhcp6/tests/tee_times_unittest.cc
@@ -102,7 +102,7 @@ public:
         // Do the actual 4-way exchange.
         ASSERT_NO_THROW(client.doSARR());
 
-        // Make sure that we go the expectec number of leases.
+        // Make sure that we go the expected number of leases.
         ASSERT_EQ(exp_leases, client.getLeaseNum());
 
         // Simulate aging of leases, by moving their cltt_ back by 1000s.
@@ -195,7 +195,7 @@ TEST_F(TeeTest, defaultTimers) {
     EXPECT_EQ(2400, actual_t2);
 }
 
-// This test verifies that custom percentags for T1 and T2
+// This test verifies that custom percentages for T1 and T2
 // can be used for calculation.
 TEST_F(TeeTest, calculateTimers) {
     Dhcp6Client client;
diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in
index 3c3b93fa8f..ea1fecfcba 100644
--- a/src/bin/keactrl/keactrl.in
+++ b/src/bin/keactrl/keactrl.in
@@ -238,7 +238,7 @@ to process ${proc_name}, PID ${_pid}."
     fi
 }
 
-# Print Kea daemon verison
+# Print Kea daemon version
 print_version() {
     name=${1}
     binary_path=${2}
diff --git a/src/bin/keactrl/tests/keactrl_tests.sh.in b/src/bin/keactrl/tests/keactrl_tests.sh.in
index aa0fac8ad5..33ff119ad7 100644
--- a/src/bin/keactrl/tests/keactrl_tests.sh.in
+++ b/src/bin/keactrl/tests/keactrl_tests.sh.in
@@ -50,7 +50,7 @@ CA_CFG_FILE="@abs_top_builddir@/src/bin/keactrl/tests/${CA_CFG_FILE_NAME}.json"
 # Names for Netconf
 NC_CFG_FILE_NAME="nc_test_config.conf"
 NC_CFG_FILE="@abs_top_builddir@/src/bin/keactrl/tests/${NC_CFG_FILE_NAME}.json"
-# Configuration files for all deamons.
+# Configuration files for all daemons.
 CFG_FILES="kea_dhcp4_config_file=${DHCP4_CFG_FILE}\n\
 kea_dhcp6_config_file=${DHCP6_CFG_FILE}\n\
 kea_dhcp_ddns_config_file=${D2_CFG_FILE}\n\
diff --git a/src/bin/netconf/netconf_config.h b/src/bin/netconf/netconf_config.h
index 34620c6368..6f8ab0f31a 100644
--- a/src/bin/netconf/netconf_config.h
+++ b/src/bin/netconf/netconf_config.h
@@ -228,19 +228,19 @@ private:
 
     /// @brief The boot-update flag.
     ///
-    /// If true (the defaul) Kea server configuration is updated at (netconf
+    /// If true (the default) Kea server configuration is updated at (netconf
     /// agent) boot time.
     bool boot_update_;
 
     /// @brief The subscribe-changes flag.
     ///
-    /// If true (the deault) the netconf agent subscribes module changes
+    /// If true (the default) the netconf agent subscribes module changes
     /// so will be notified when the YANG running configuration is changed.
     bool subscribe_changes_;
 
     /// @brief The validate-changes flag.
     ///
-    /// If true (the deault) the netconf agent validates module changes
+    /// If true (the default) the netconf agent validates module changes
     /// and can reject bad configurations.
     bool validate_changes_;
 
diff --git a/src/bin/netconf/tests/parser_unittests.cc b/src/bin/netconf/tests/parser_unittests.cc
index 7e387f07d6..b6b81f6faf 100644
--- a/src/bin/netconf/tests/parser_unittests.cc
+++ b/src/bin/netconf/tests/parser_unittests.cc
@@ -655,7 +655,7 @@ TEST(ParserTest, errors) {
 
     // unknown keyword
     testError("{ \"Netconf\":{\n"
-              " \"topping\": \"Mozarella\" }}\n",
+              " \"topping\": \"Mozzarella\" }}\n",
               ParserContext::PARSER_NETCONF,
               "<string>:2.2-10: got unexpected keyword "
               "\"topping\" in Netconf map.");
diff --git a/src/bin/perfdhcp/abstract_scen.h b/src/bin/perfdhcp/abstract_scen.h
index 1088976831..a8ace144b3 100644
--- a/src/bin/perfdhcp/abstract_scen.h
+++ b/src/bin/perfdhcp/abstract_scen.h
@@ -49,7 +49,7 @@ public:
 
 protected:
     CommandOptions& options_; ///< Reference to commandline options.
-    TestControl tc_;  ///< Object for controling sending and receiving packets.
+    TestControl tc_;  ///< Object for controlling sending and receiving packets.
 
     // Helper fields to avoid checking IP version each time an exchange type
     // is needed.
diff --git a/src/bin/perfdhcp/avalanche_scen.cc b/src/bin/perfdhcp/avalanche_scen.cc
index df394c50f2..3e80b01e4e 100644
--- a/src/bin/perfdhcp/avalanche_scen.cc
+++ b/src/bin/perfdhcp/avalanche_scen.cc
@@ -97,13 +97,13 @@ AvalancheScen::run() {
     // First indicated number of DISCOVER packets eg. 4000 are sent.
     // Then in a loop responses to received packets (this is
     // consumeReceivedPackets()) are sent and then for every 200ms it is checked
-    // if reponses to sent packets were received. If not packets are resent.
+    // if responses to sent packets were received. If not packets are resent.
     // This happens in resendPackets() method. For each packet it is checked
     // how many times it was already resent and then back off time is calculated:
     // 1, 2, 4, 8, 16, 64 (max) seconds. If estimated time has elapsed
     // from previous sending then the packet is resent. Some stats are collected
-    // and printed during runtime. The whole procedure is stopeed when
-    // all packets got reponses.
+    // and printed during runtime. The whole procedure is stoped when
+    // all packets got responses.
 
     uint32_t clients_num = options_.getClientsNum() == 0 ?
         1 : options_.getClientsNum();
diff --git a/src/bin/perfdhcp/avalanche_scen.h b/src/bin/perfdhcp/avalanche_scen.h
index 932b26d7b6..766453d2e0 100644
--- a/src/bin/perfdhcp/avalanche_scen.h
+++ b/src/bin/perfdhcp/avalanche_scen.h
@@ -30,7 +30,7 @@ struct EnumClassHash
 /// \brief Avalanche Scenario class.
 ///
 /// This class is used to run the performance test where DHCP server
-/// is first loaded with indicated bumer of Discover or Solicit messages
+/// is first loaded with indicated buffer of Discover or Solicit messages
 /// and then the class is waiting till receiving all required responses.
 /// Full DORA and SARR message sequences are expected.
 class AvalancheScen : public AbstractScen {
diff --git a/src/bin/perfdhcp/command_options.h b/src/bin/perfdhcp/command_options.h
index 1523426270..5bb9767af4 100644
--- a/src/bin/perfdhcp/command_options.h
+++ b/src/bin/perfdhcp/command_options.h
@@ -220,7 +220,7 @@ public:
 
     /// \brief Returns time to wait for elapsed time increase.
     ///
-    /// \return how long perfdhp will wait before start sending
+    /// \return how long perfdhcp will wait before start sending
     /// messages with increased elapsed time.
     int getWaitForElapsedTime() const { return wait_for_elapsed_time_; }
 
@@ -629,7 +629,7 @@ private:
     /// Test period in seconds.
     int period_;
 
-    // for how long perfdhcp will wait before start senging
+    // for how long perfdhcp will wait before start sending
     // messages with increased elapsed time.
     int wait_for_elapsed_time_;
 
diff --git a/src/bin/perfdhcp/receiver.cc b/src/bin/perfdhcp/receiver.cc
index 59549ef2db..b6a42a3f1d 100644
--- a/src/bin/perfdhcp/receiver.cc
+++ b/src/bin/perfdhcp/receiver.cc
@@ -102,12 +102,12 @@ Receiver::readPktFromSocket() {
     PktPtr pkt;
     uint32_t timeout;
     if (single_threaded_) {
-        // In case of single thread just check socket and if empty exit immediatelly
+        // In case of single thread just check socket and if empty exit immediately
         // to not slow down sending part.
         timeout = 0;
     } else {
         // In case of multi thread wait for packets a little bit (1ms) as it is run
-        // in separate thread and do not interefere with sending thread.
+        // in separate thread and do not interfere with sending thread.
         timeout = 1000;
     }
     try {
diff --git a/src/bin/perfdhcp/receiver.h b/src/bin/perfdhcp/receiver.h
index 82bc759d16..bfb6e0d070 100644
--- a/src/bin/perfdhcp/receiver.h
+++ b/src/bin/perfdhcp/receiver.h
@@ -20,14 +20,14 @@
 namespace isc {
 namespace perfdhcp {
 
-/// \brief A receviving DHCP packets class.
+/// \brief A receiving DHCP packets class.
 ///
 /// Receiver can be used in two modes: single-thread and multi-thread.
 ///
 /// In single-thread mode the class directly reads packets from socket
 /// and returns them to consumer using getPkt method.
 ///
-/// In case of multi-thread mode the class starts a thread in backgroud.
+/// In case of multi-thread mode the class starts a thread in the background.
 /// The thread reads the packets and pushes them to pkt_queue_. Then
 /// in main thread packets can be consumed from the queue using getPkt
 /// method.
diff --git a/src/bin/perfdhcp/tests/avalanche_scen_unittest.cc b/src/bin/perfdhcp/tests/avalanche_scen_unittest.cc
index 7fcd4e67c6..08e8b0ea7b 100644
--- a/src/bin/perfdhcp/tests/avalanche_scen_unittest.cc
+++ b/src/bin/perfdhcp/tests/avalanche_scen_unittest.cc
@@ -228,7 +228,7 @@ TEST_F(AvalancheScenTest, Packet4Exchange) {
 
     as.run();
 
-    // Check if basic exchange of packets happend. No retransmissions expected.
+    // Check if basic exchange of packets happened. No retransmissions expected.
     EXPECT_EQ(as.total_resent_, 0);
     EXPECT_EQ(as.fake_sock_.sent_cnt_, 20); // Discovery + Request
     EXPECT_EQ(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::DO), 10);
@@ -245,7 +245,7 @@ TEST_F(AvalancheScenTest, Packet4ExchangeOnlyDO) {
 
     as.run();
 
-    // Check if DO exchange of packets happend only. No retransmissions expected.
+    // Check if DO exchange of packets happened only. No retransmissions expected.
     EXPECT_EQ(as.total_resent_, 0);
     EXPECT_EQ(as.fake_sock_.sent_cnt_, 10); // Discovery + Request
     EXPECT_EQ(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::DO), 10);
@@ -262,7 +262,7 @@ TEST_F(AvalancheScenTest, Packet4ExchangeWithRetransmissions) {
     as.fake_sock_.initial_drops_cnt_ = 2;
     as.run();
 
-    // Check if basic exchange of packets happend. No retransmissions expected.
+    // Check if basic exchange of packets happened. No retransmissions expected.
     EXPECT_EQ(as.total_resent_, 2);
     EXPECT_EQ(as.fake_sock_.sent_cnt_, 22); // Discovery + Request
     EXPECT_EQ(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::DO), 10);
@@ -279,7 +279,7 @@ TEST_F(AvalancheScenTest, Packet6Exchange) {
 
     as.run();
 
-    // Check if basic exchange of packets happend. No retransmissions expected.
+    // Check if basic exchange of packets happened. No retransmissions expected.
     EXPECT_EQ(as.total_resent_, 0);
     EXPECT_GE(as.fake_sock_.sent_cnt_, 20); // Solicit + Request
     EXPECT_GE(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::SA), 10);
@@ -296,7 +296,7 @@ TEST_F(AvalancheScenTest, Packet6ExchangeOnlySA) {
 
     as.run();
 
-    // Check if SA exchange of packets happend only. No retransmissions expected.
+    // Check if SA exchange of packets happened only. No retransmissions expected.
     EXPECT_EQ(as.total_resent_, 0);
     EXPECT_GE(as.fake_sock_.sent_cnt_, 10); // Solicit + Request
     EXPECT_GE(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::SA), 10);
@@ -313,7 +313,7 @@ TEST_F(AvalancheScenTest, Packet6ExchangeWithRetransmissions) {
     as.fake_sock_.initial_drops_cnt_ = 2;
     as.run();
 
-    // Check if basic exchange of packets happend. No retransmissions expected.
+    // Check if basic exchange of packets happened. No retransmissions expected.
     EXPECT_EQ(as.total_resent_, 2);
     EXPECT_EQ(as.fake_sock_.sent_cnt_, 22); // Discovery + Request
     EXPECT_EQ(as.tc_.getStatsMgr().getSentPacketsNum(ExchangeType::SA), 10);
diff --git a/src/bin/perfdhcp/tests/test_control_unittest.cc b/src/bin/perfdhcp/tests/test_control_unittest.cc
index 7805b9c441..695ff7d78e 100644
--- a/src/bin/perfdhcp/tests/test_control_unittest.cc
+++ b/src/bin/perfdhcp/tests/test_control_unittest.cc
@@ -509,7 +509,7 @@ public:
         tc.setTransidGenerator(generator);
         for (int i = 0; i < iterations_num; ++i) {
             // Get next transaction id, without actually using it. The same
-            // id wll be used by the TestControl class for DHCPDISCOVER.
+            // id will be used by the TestControl class for DHCPDISCOVER.
             uint32_t transid = generator->getNext();
             if (use_templates) {
                 tc.sendDiscover4(tc.getTemplateBuffer(0));
@@ -1736,7 +1736,7 @@ TEST_F(TestControlTest, createRelease) {
 // Test checks if sendDiscover really includes custom options
 TEST_F(TestControlTest, sendDiscoverExtraOpts) {
 
-    // Important paramters here:
+    // Important parameters here:
     // -xT - save first packet of each type for templates (useful for packet inspection)
     // -o 200,abcdef1234 - send option 200 with hex content: ab:cd:ef:12:34
     // -o 201,00 - send option 201 with hex content: 00
@@ -1763,7 +1763,7 @@ TEST_F(TestControlTest, sendDiscoverExtraOpts) {
 // Test checks if regular packet exchange inserts the extra v4 options
 // specified on command line.
 TEST_F(TestControlTest, Packet4ExchangeExtraOpts) {
-    // Important paramters here:
+    // Important parameters here:
     // -xT - save first packet of each type for templates (useful for packet inspection)
     // -o 200,abcdef1234 - send option 200 with hex content: ab:cd:ef:12:34
     // -o 201,00 - send option 201 with hex content: 00
@@ -1798,7 +1798,7 @@ TEST_F(TestControlTest, Packet4ExchangeExtraOpts) {
 // Test checks if regular packet exchange inserts the extra v6 options
 // specified on command line.
 TEST_F(TestControlTest, Packet6ExchangeExtraOpts) {
-    // Important paramters here:
+    // Important parameters here:
     // -xT - save first packet of each type for templates (useful for packet inspection)
     // -o 200,abcdef1234 - send option 200 with hex content: ab:cd:ef:12:34
     // -o 201,00 - send option 201 with hex content: 00
@@ -1837,7 +1837,7 @@ TEST_F(TestControlTest, Packet6ExchangeExtraOpts) {
 // Test checks if multiple v4 PRL options can be sent. They should be merged
 // into a single PRL option by perfdhcp.
 TEST_F(TestControlTest, sendDiscoverMultiplePRLs) {
-    // Important paramters here:
+    // Important parameters here:
     // -o 55,1234 - send option 55 with hex content '1234'
     // -o 55,abcd - send option 55 with hex content 'abcd'
     CommandOptions opt;
diff --git a/src/bin/shell/kea-shell.in b/src/bin/shell/kea-shell.in
index f229040857..d55fc6181d 100644
--- a/src/bin/shell/kea-shell.in
+++ b/src/bin/shell/kea-shell.in
@@ -71,7 +71,7 @@ def shell_body():
                         help='Timeout (in seconds) when attempting to '
                         'connect to CA (default: 10)')
     parser.add_argument('--service', nargs="?", action="append",
-                        help='target spcified service. If not specified,'
+                        help='target specified service. If not specified,'
                         'control agent will receive command.')
     parser.add_argument('--auth-user', type=auth8, default='',
                         help='Basic HTTP authentication user')