diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/+TARGETS b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/+TARGETS
index 33d000bba..1e155e5a5 100644
--- a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/+TARGETS
+++ b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/+TARGETS
@@ -1,11 +1,11 @@
-bing.db:/usr/local/etc/namedb/master/bing.db
-blacklist.db:/usr/local/etc/namedb/master/blacklist.db
-domain.db:/usr/local/etc/namedb/master/[OPNsense.bind.domain.domains.domain.%.domainname].db
-duckduckgo.db:/usr/local/etc/namedb/master/duckduckgo.db
-google.db:/usr/local/etc/namedb/master/google.db
+bing.db:/usr/local/etc/namedb/primary/bing.db
+blacklist.db:/usr/local/etc/namedb/primary/blacklist.db
+domain.db:/usr/local/etc/namedb/primary/[OPNsense.bind.domain.domains.domain.%.domainname].db
+duckduckgo.db:/usr/local/etc/namedb/primary/duckduckgo.db
+google.db:/usr/local/etc/namedb/primary/google.db
 named:/etc/rc.conf.d/named
 named.conf:/usr/local/etc/namedb/named.conf
 rndc.conf:/usr/local/etc/namedb/rndc.conf
-whitelist.db:/usr/local/etc/namedb/master/whitelist.db
+whitelist.db:/usr/local/etc/namedb/primary/whitelist.db
 whitelist.inc:/usr/local/etc/namedb/whitelist.inc
-youtube.db:/usr/local/etc/namedb/master/youtube.db
+youtube.db:/usr/local/etc/namedb/primary/youtube.db
diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
index 94fd79aac..b0e2efc38 100644
--- a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
+++ b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
@@ -99,34 +99,34 @@ controls {
 
 zone "." { type hint; file "/usr/local/etc/namedb/named.root"; };
 
-zone "localhost"        { type master; file "/usr/local/etc/namedb/master/localhost-forward.db"; };
-zone "127.in-addr.arpa" { type master; file "/usr/local/etc/namedb/master/localhost-reverse.db"; };
-zone "0.ip6.arpa"       { type master; file "/usr/local/etc/namedb/master/localhost-reverse.db"; };
+zone "localhost"        { type master; file "/usr/local/etc/namedb/primary/localhost-forward.db"; };
+zone "127.in-addr.arpa" { type master; file "/usr/local/etc/namedb/primary/localhost-reverse.db"; };
+zone "0.ip6.arpa"       { type master; file "/usr/local/etc/namedb/primary/localhost-reverse.db"; };
 
 {% if helpers.exists('OPNsense.bind.dnsbl.enabled') and OPNsense.bind.dnsbl.enabled == '1' %}
 {%   if helpers.exists('OPNsense.bind.dnsbl.type') and OPNsense.bind.dnsbl.type != '' %}
-zone "whitelist.localdomain" { type master; file "/usr/local/etc/namedb/master/whitelist.db"; notify no; check-names ignore; };
-zone "blacklist.localdomain" { type master; file "/usr/local/etc/namedb/master/blacklist.db"; notify no; check-names ignore; };
+zone "whitelist.localdomain" { type master; file "/usr/local/etc/namedb/primary/whitelist.db"; notify no; check-names ignore; };
+zone "blacklist.localdomain" { type master; file "/usr/local/etc/namedb/primary/blacklist.db"; notify no; check-names ignore; };
 {%   endif %}
 {% endif %}
 {% if helpers.exists('OPNsense.bind.dnsbl.enabled') and OPNsense.bind.dnsbl.enabled == '1' %}
 {%   if helpers.exists('OPNsense.bind.dnsbl.forcesafegoogle') and OPNsense.bind.dnsbl.forcesafegoogle == '1' %}
-zone "rpzgoogle" { type master; file "/usr/local/etc/namedb/master/google.db"; notify no; check-names ignore; };
+zone "rpzgoogle" { type master; file "/usr/local/etc/namedb/primary/google.db"; notify no; check-names ignore; };
 {%   endif %}
 {% endif %}
 {% if helpers.exists('OPNsense.bind.dnsbl.enabled') and OPNsense.bind.dnsbl.enabled == '1' %}
 {%   if helpers.exists('OPNsense.bind.dnsbl.forcesafeduckduckgo') and OPNsense.bind.dnsbl.forcesafeduckduckgo == '1' %}
-zone "rpzduckduckgo" { type master; file "/usr/local/etc/namedb/master/duckduckgo.db"; notify no; check-names ignore; };
+zone "rpzduckduckgo" { type master; file "/usr/local/etc/namedb/primary/duckduckgo.db"; notify no; check-names ignore; };
 {%   endif %}
 {% endif %}
 {% if helpers.exists('OPNsense.bind.dnsbl.enabled') and OPNsense.bind.dnsbl.enabled == '1' %}
 {%   if helpers.exists('OPNsense.bind.dnsbl.forcesafeyoutube') and OPNsense.bind.dnsbl.forcesafeyoutube == '1' %}
-zone "rpzyoutube" { type master; file "/usr/local/etc/namedb/master/youtube.db"; notify no; check-names ignore; };
+zone "rpzyoutube" { type master; file "/usr/local/etc/namedb/primary/youtube.db"; notify no; check-names ignore; };
 {%   endif %}
 {% endif %}
 {% if helpers.exists('OPNsense.bind.dnsbl.enabled') and OPNsense.bind.dnsbl.enabled == '1' %}
 {%   if helpers.exists('OPNsense.bind.dnsbl.forcestrictbing') and OPNsense.bind.dnsbl.forcestrictbing == '1' %}
-zone "rpzbing" { type master; file "/usr/local/etc/namedb/master/bing.db"; notify no; check-names ignore; };
+zone "rpzbing" { type master; file "/usr/local/etc/namedb/primary/bing.db"; notify no; check-names ignore; };
 {%   endif %}
 {% endif %}
 
@@ -147,9 +147,9 @@ zone "{{ domain.domainname }}" {
 {%         if domain.allownotifyslave is defined %}
         allow-notify { {{ domain.allownotifyslave.replace(',', '; ') }}; };
 {%         endif %}
-        file "/usr/local/etc/namedb/slave/{{ domain.domainname }}.db";
+        file "/usr/local/etc/namedb/secondary/{{ domain.domainname }}.db";
 {%       else %}
-        file "/usr/local/etc/namedb/master/{{ domain.domainname }}.db";
+        file "/usr/local/etc/namedb/primary/{{ domain.domainname }}.db";
 {%       endif %}
 {%       if domain.allowtransfer is defined %}
         allow-transfer { {{ allow_transfer.name }}; };