diff --git a/src/hooks/d2/Makefile.am b/src/hooks/d2/Makefile.am
index bc21b1afd1..ecc8d6e2b7 100644
--- a/src/hooks/d2/Makefile.am
+++ b/src/hooks/d2/Makefile.am
@@ -1 +1,4 @@
-SUBDIRS = gss_tsig
+SUBDIRS =
+if HAVE_GSSAPI
+SUBDIRS += gss_tsig
+endif
diff --git a/src/hooks/d2/gss_tsig/Makefile.am b/src/hooks/d2/gss_tsig/Makefile.am
index a1b5302116..ca73ef3898 100644
--- a/src/hooks/d2/gss_tsig/Makefile.am
+++ b/src/hooks/d2/gss_tsig/Makefile.am
@@ -1,4 +1,3 @@
-if HAVE_GSSAPI
 SUBDIRS = . testutils libloadtests tests
 
 AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
@@ -96,5 +95,3 @@ messages gss_tsig_messages.h gss_tsig_messages.cc:
 	@echo Messages generation disabled. Configure with --enable-generate-messages to enable it.
 
 endif
-
-endif
diff --git a/src/hooks/d2/gss_tsig/meson.build b/src/hooks/d2/gss_tsig/meson.build
index 8b94588ccb..d8a90d53fd 100644
--- a/src/hooks/d2/gss_tsig/meson.build
+++ b/src/hooks/d2/gss_tsig/meson.build
@@ -32,7 +32,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-d2-gss_tsig-gss_tsig_messages',
+        'src-hooks-d2-gss_tsig-gss_tsig_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/class_cmds/meson.build b/src/hooks/dhcp/class_cmds/meson.build
index 77cadb9b6c..4c3d82c7a3 100644
--- a/src/hooks/dhcp/class_cmds/meson.build
+++ b/src/hooks/dhcp/class_cmds/meson.build
@@ -21,7 +21,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-class_cmds-class_cmds_messages',
+        'src-hooks-dhcp-class_cmds-class_cmds_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/ddns_tuning/meson.build b/src/hooks/dhcp/ddns_tuning/meson.build
index 2d2879b398..c25010c94f 100644
--- a/src/hooks/dhcp/ddns_tuning/meson.build
+++ b/src/hooks/dhcp/ddns_tuning/meson.build
@@ -22,7 +22,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-ddns_tuning-ddns_tuning_messages',
+        'src-hooks-dhcp-ddns_tuning-ddns_tuning_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/flex_id/meson.build b/src/hooks/dhcp/flex_id/meson.build
index 277b9f1456..b8fb90bf1e 100644
--- a/src/hooks/dhcp/flex_id/meson.build
+++ b/src/hooks/dhcp/flex_id/meson.build
@@ -21,7 +21,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-flex_id-flex_id_messages',
+        'src-hooks-dhcp-flex_id-flex_id_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/forensic_log/meson.build b/src/hooks/dhcp/forensic_log/meson.build
index 471545554d..c3751c3f0a 100644
--- a/src/hooks/dhcp/forensic_log/meson.build
+++ b/src/hooks/dhcp/forensic_log/meson.build
@@ -35,7 +35,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-forensic_log-legal_log_messages',
+        'src-hooks-dhcp-forensic_log-legal_log_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/host_cache/meson.build b/src/hooks/dhcp/host_cache/meson.build
index 3a4f1fe2c1..9584c29fa8 100644
--- a/src/hooks/dhcp/host_cache/meson.build
+++ b/src/hooks/dhcp/host_cache/meson.build
@@ -24,7 +24,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-host_cache-host_cache_messages',
+        'src-hooks-dhcp-host_cache-host_cache_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/host_cmds/meson.build b/src/hooks/dhcp/host_cmds/meson.build
index 3a34ea90dc..d14900e37d 100644
--- a/src/hooks/dhcp/host_cmds/meson.build
+++ b/src/hooks/dhcp/host_cmds/meson.build
@@ -21,7 +21,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-host_cmds-host_cmds_messages',
+        'src-hooks-dhcp-host_cmds-host_cmds_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/lease_cmds/binding_variables.cc b/src/hooks/dhcp/lease_cmds/binding_variables.cc
index a47ec9b8fd..d1643cf0f2 100644
--- a/src/hooks/dhcp/lease_cmds/binding_variables.cc
+++ b/src/hooks/dhcp/lease_cmds/binding_variables.cc
@@ -1,8 +1,9 @@
 // Copyright (C) 2025 Internet Systems Consortium, Inc. ("ISC")
 //
-// This Source Code Form is subject to the terms of the Kea Hooks Basic
-// Commercial End User License Agreement v2.0. See COPYING file in the premium/
-// directory.
+// 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>
 
diff --git a/src/hooks/dhcp/lease_cmds/binding_variables.h b/src/hooks/dhcp/lease_cmds/binding_variables.h
index 131b6844b9..88fdaa1c29 100644
--- a/src/hooks/dhcp/lease_cmds/binding_variables.h
+++ b/src/hooks/dhcp/lease_cmds/binding_variables.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2025 Internet Systems Consortium, Inc. ("ISC")
 //
-// This Source Code Form is subject to the terms of the Kea Hooks Basic
-// Commercial End User License Agreement v2.0. See COPYING file in the premium/
-// directory.
+// 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/.
 
 #ifndef BINDING_VARIABLES_H
 #define BINDING_VARIABLES_H
diff --git a/src/hooks/dhcp/lease_query/meson.build b/src/hooks/dhcp/lease_query/meson.build
index aaadc24483..485d23eb4a 100644
--- a/src/hooks/dhcp/lease_query/meson.build
+++ b/src/hooks/dhcp/lease_query/meson.build
@@ -29,7 +29,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-lease_query-lease_query_messages',
+        'src-hooks-dhcp-lease_query-lease_query_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/limits/meson.build b/src/hooks/dhcp/limits/meson.build
index 0fa22d6be6..935502bfc7 100644
--- a/src/hooks/dhcp/limits/meson.build
+++ b/src/hooks/dhcp/limits/meson.build
@@ -24,7 +24,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-limits-limits_messages',
+        'src-hooks-dhcp-limits-limits_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/perfmon/Makefile.am b/src/hooks/dhcp/perfmon/Makefile.am
index 2f5f29c82c..f0a754d3a7 100644
--- a/src/hooks/dhcp/perfmon/Makefile.am
+++ b/src/hooks/dhcp/perfmon/Makefile.am
@@ -82,7 +82,7 @@ messages: perfmon_messages.h perfmon_messages.cc
 
 perfmon_messages.h perfmon_messages.cc: perfmon_messages.mes
 	(cd $(top_srcdir); \
-	$(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/perfmon/perfmon_messages.mes
+	$(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/perfmon/perfmon_messages.mes)
 
 else
 
diff --git a/src/hooks/dhcp/ping_check/meson.build b/src/hooks/dhcp/ping_check/meson.build
index 086f248bd3..5245d9de17 100644
--- a/src/hooks/dhcp/ping_check/meson.build
+++ b/src/hooks/dhcp/ping_check/meson.build
@@ -27,7 +27,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-ping_check-ping_check_messages',
+        'src-hooks-dhcp-ping_check-ping_check_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/radius/meson.build b/src/hooks/dhcp/radius/meson.build
index 3d9500b974..c0dd0e01ff 100644
--- a/src/hooks/dhcp/radius/meson.build
+++ b/src/hooks/dhcp/radius/meson.build
@@ -42,7 +42,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-radius-radius_messages',
+        'src-hooks-dhcp-radius-radius_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,
diff --git a/src/hooks/dhcp/subnet_cmds/meson.build b/src/hooks/dhcp/subnet_cmds/meson.build
index 156c6e897b..5c13a65a1f 100644
--- a/src/hooks/dhcp/subnet_cmds/meson.build
+++ b/src/hooks/dhcp/subnet_cmds/meson.build
@@ -21,7 +21,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-subnet_cmds-subnet_cmds_messages',
+        'src-hooks-dhcp-subnet_cmds-subnet_cmds_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,