diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
index 0ea6502708..60f22e1596 100644
--- a/bin/tests/system/acl/ns2/named1.conf.in
+++ b/bin/tests/system/acl/ns2/named1.conf.in
@@ -48,12 +48,12 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "tsigzone" {
-	type master;
+	type primary;
 	file "tsigzone.db";
 	allow-transfer { !key one; any; };
 };
diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.in
index b877880554..ada97bcf24 100644
--- a/bin/tests/system/acl/ns2/named2.conf.in
+++ b/bin/tests/system/acl/ns2/named2.conf.in
@@ -48,12 +48,12 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "tsigzone" {
-	type master;
+	type primary;
 	file "tsigzone.db";
 	/*
 	 * 0a00::/8 and 10/8 are the same bits, but different address
diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.in
index 0a950622a2..97684e4d9b 100644
--- a/bin/tests/system/acl/ns2/named3.conf.in
+++ b/bin/tests/system/acl/ns2/named3.conf.in
@@ -61,12 +61,12 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "tsigzone" {
-	type master;
+	type primary;
 	file "tsigzone.db";
 	allow-transfer { !reject; accept; };
 };
diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.in
index 7cdcb6e341..462b3fad6f 100644
--- a/bin/tests/system/acl/ns2/named4.conf.in
+++ b/bin/tests/system/acl/ns2/named4.conf.in
@@ -60,12 +60,12 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "tsigzone" {
-	type master;
+	type primary;
 	file "tsigzone.db";
 	allow-transfer { !rejectkeys; !rejectaddrs; !check1; !check2; any; };
 };
diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in
index 7e20bac49d..728da58d65 100644
--- a/bin/tests/system/acl/ns2/named5.conf.in
+++ b/bin/tests/system/acl/ns2/named5.conf.in
@@ -50,12 +50,12 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "tsigzone" {
-	type master;
+	type primary;
 	file "tsigzone.db";
 	allow-transfer { !key one; any; };
 };
diff --git a/bin/tests/system/acl/ns4/named.conf.in b/bin/tests/system/acl/ns4/named.conf.in
index 17cef4a7ec..e4c57463c6 100644
--- a/bin/tests/system/acl/ns4/named.conf.in
+++ b/bin/tests/system/acl/ns4/named.conf.in
@@ -33,6 +33,6 @@ key rndc_key {
 };
 
 zone "existing" {
-	type master;
+	type primary;
 	file "existing.db";
 };
diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
index 4d915244ba..bfcd7f3fe8 100644
--- a/bin/tests/system/acl/tests.sh
+++ b/bin/tests/system/acl/tests.sh
@@ -168,7 +168,7 @@ status=`expr $status + $ret`
 echo_i "testing allow-transfer ACLs against ns3 (no existing zones)"
 
 echo_i "calling addzone example.com on ns3"
-$RNDCCMD 10.53.0.3 addzone 'example.com {type master; file "example.db"; }; '
+$RNDCCMD 10.53.0.3 addzone 'example.com {type primary; file "example.db"; }; '
 sleep 1
 
 t=`expr $t + 1`
@@ -197,7 +197,7 @@ status=`expr $status + $ret`
 echo_i "testing allow-transfer ACLs against ns4 (1 pre-existing zone)"
 
 echo_i "calling addzone example.com on ns4"
-$RNDCCMD 10.53.0.4 addzone 'example.com {type master; file "example.db"; }; '
+$RNDCCMD 10.53.0.4 addzone 'example.com {type primary; file "example.db"; }; '
 sleep 1
 
 t=`expr $t + 1`
diff --git a/bin/tests/system/additional/ns1/named1.conf.in b/bin/tests/system/additional/ns1/named1.conf.in
index 4c850109d9..306e80fa20 100644
--- a/bin/tests/system/additional/ns1/named1.conf.in
+++ b/bin/tests/system/additional/ns1/named1.conf.in
@@ -30,31 +30,31 @@ controls {
 };
 
 zone "." {
-        type master;
+        type primary;
         file "root.db";
 };
 
 zone "rt.example" {
-	type master;
+	type primary;
 	file "rt.db";
 };
 
 zone "naptr.example" {
-	type master;
+	type primary;
 	file "naptr.db";
 };
 
 zone "rt2.example" {
-	type master;
+	type primary;
 	file "rt2.db";
 };
 
 zone "naptr2.example" {
-	type master;
+	type primary;
 	file "naptr2.db";
 };
 
 zone "nid.example" {
-	type master;
+	type primary;
 	file "nid.db";
 };
diff --git a/bin/tests/system/additional/ns1/named2.conf.in b/bin/tests/system/additional/ns1/named2.conf.in
index b71434892c..6a341f1b33 100644
--- a/bin/tests/system/additional/ns1/named2.conf.in
+++ b/bin/tests/system/additional/ns1/named2.conf.in
@@ -30,31 +30,31 @@ controls {
 };
 
 zone "." {
-        type master;
+        type primary;
         file "root.db";
 };
 
 zone "rt.example" {
-	type master;
+	type primary;
 	file "rt.db";
 };
 
 zone "naptr.example" {
-	type master;
+	type primary;
 	file "naptr.db";
 };
 
 zone "rt2.example" {
-	type master;
+	type primary;
 	file "rt2.db";
 };
 
 zone "naptr2.example" {
-	type master;
+	type primary;
 	file "naptr2.db";
 };
 
 zone "nid.example" {
-	type master;
+	type primary;
 	file "nid.db";
 };
diff --git a/bin/tests/system/additional/ns1/named3.conf.in b/bin/tests/system/additional/ns1/named3.conf.in
index 3df718436a..85d94d5e89 100644
--- a/bin/tests/system/additional/ns1/named3.conf.in
+++ b/bin/tests/system/additional/ns1/named3.conf.in
@@ -31,31 +31,31 @@ controls {
 };
 
 zone "." {
-        type master;
+        type primary;
         file "root.db";
 };
 
 zone "rt.example" {
-	type master;
+	type primary;
 	file "rt.db";
 };
 
 zone "naptr.example" {
-	type master;
+	type primary;
 	file "naptr.db";
 };
 
 zone "rt2.example" {
-	type master;
+	type primary;
 	file "rt2.db";
 };
 
 zone "naptr2.example" {
-	type master;
+	type primary;
 	file "naptr2.db";
 };
 
 zone "nid.example" {
-	type master;
+	type primary;
 	file "nid.db";
 };
diff --git a/bin/tests/system/additional/ns1/named4.conf.in b/bin/tests/system/additional/ns1/named4.conf.in
index f7947c2e2a..2808c438a3 100644
--- a/bin/tests/system/additional/ns1/named4.conf.in
+++ b/bin/tests/system/additional/ns1/named4.conf.in
@@ -30,41 +30,41 @@ controls {
 };
 
 zone "." {
-        type master;
+        type primary;
         file "root.db";
 };
 
 zone "mx.example" {
-	type master;
+	type primary;
 	file "mx.db";
 };
 
 zone "srv.example" {
-	type master;
+	type primary;
 	file "srv.db";
 };
 
 zone "rt.example" {
-	type master;
+	type primary;
 	file "rt.db";
 };
 
 zone "naptr.example" {
-	type master;
+	type primary;
 	file "naptr.db";
 };
 
 zone "rt2.example" {
-	type master;
+	type primary;
 	file "rt2.db";
 };
 
 zone "naptr2.example" {
-	type master;
+	type primary;
 	file "naptr2.db";
 };
 
 zone "nid.example" {
-	type master;
+	type primary;
 	file "nid.db";
 };
diff --git a/bin/tests/system/additional/ns2/named.conf.in b/bin/tests/system/additional/ns2/named.conf.in
index 1437ec444d..4c41816bbe 100644
--- a/bin/tests/system/additional/ns2/named.conf.in
+++ b/bin/tests/system/additional/ns2/named.conf.in
@@ -23,6 +23,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/additional/ns3/named.conf.in b/bin/tests/system/additional/ns3/named.conf.in
index 7dcd0bd0be..de87de56e4 100644
--- a/bin/tests/system/additional/ns3/named.conf.in
+++ b/bin/tests/system/additional/ns3/named.conf.in
@@ -30,11 +30,11 @@ zone "." {
 };
 
 zone "ex" {
-	type master;
+	type primary;
 	file "ex.db";
 };
 
 zone "ex2" {
-	type master;
+	type primary;
 	file "ex2.db";
 };
diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh
index de727c308e..12d879d0c0 100644
--- a/bin/tests/system/addzone/clean.sh
+++ b/bin/tests/system/addzone/clean.sh
@@ -24,7 +24,7 @@ rm -f ./ns3/*.nzd ./ns3/*.nzd-lock
 rm -f ./ns2/core*
 rm -f ./ns2/inline.db.jbk
 rm -f ./ns2/inline.db.signed
-rm -f ./ns2/inlineslave.bk*
+rm -f ./ns2/inlinesec.bk*
 rm -rf ./ns2/new-zones
 rm -f ./ns*/named.lock
 rm -f ./ns*/named.run ./ns*/named.run.prev
@@ -32,7 +32,7 @@ rm -f ./ns2/nzf-*
 rm -f ./ns3/named.conf
 rm -f ./ns3/*.nzf ./ns3/*.nzf~
 rm -f ./ns3/*.nzd ns3/*.nzd-lock
-rm -f ./ns3/inlineslave.db
+rm -f ./ns3/inlinesec.db
 rm -f ./ns1/redirect.db
 rm -f ./ns2/redirect.db
 rm -f ./ns2/redirect.bk
diff --git a/bin/tests/system/addzone/ns1/inlineslave.db b/bin/tests/system/addzone/ns1/inlinesec.db
similarity index 95%
rename from bin/tests/system/addzone/ns1/inlineslave.db
rename to bin/tests/system/addzone/ns1/inlinesec.db
index 625349ec4d..5db7e024e3 100644
--- a/bin/tests/system/addzone/ns1/inlineslave.db
+++ b/bin/tests/system/addzone/ns1/inlinesec.db
@@ -7,7 +7,7 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-$ORIGIN inlineslave.example.
+$ORIGIN inlinesec.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (
 				1          ; serial
diff --git a/bin/tests/system/addzone/ns1/named.conf.in b/bin/tests/system/addzone/ns1/named.conf.in
index 3939091de8..a3f4256a96 100644
--- a/bin/tests/system/addzone/ns1/named.conf.in
+++ b/bin/tests/system/addzone/ns1/named.conf.in
@@ -33,9 +33,9 @@ zone "." {
 	file "../../common/root.hint";
 };
 
-zone "inlineslave.example" {
-	type master;
-	file "inlineslave.db";
+zone "inlinesec.example" {
+	type primary;
+	file "inlinesec.db";
 };
 
 zone "." {
diff --git a/bin/tests/system/addzone/ns2/default.nzf.in b/bin/tests/system/addzone/ns2/default.nzf.in
index 099f9e4a11..614bddeb43 100644
--- a/bin/tests/system/addzone/ns2/default.nzf.in
+++ b/bin/tests/system/addzone/ns2/default.nzf.in
@@ -1 +1 @@
-zone previous.example { type master; file "previous.db"; };
+zone previous.example { type primary; file "previous.db"; };
diff --git a/bin/tests/system/addzone/ns2/named1.conf.in b/bin/tests/system/addzone/ns2/named1.conf.in
index 47a3cc9969..dc1d26fc5d 100644
--- a/bin/tests/system/addzone/ns2/named1.conf.in
+++ b/bin/tests/system/addzone/ns2/named1.conf.in
@@ -31,11 +31,11 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "normal.db";
 };
 
 zone "finaldot.example." {
-	type master;
+	type primary;
 	file "normal.db";
 };
diff --git a/bin/tests/system/addzone/ns2/named2.conf.in b/bin/tests/system/addzone/ns2/named2.conf.in
index c063d425f0..94724d50d9 100644
--- a/bin/tests/system/addzone/ns2/named2.conf.in
+++ b/bin/tests/system/addzone/ns2/named2.conf.in
@@ -37,7 +37,7 @@ view internal {
 	};
 
 	zone "policy" {
-		type master;
+		type primary;
 		file "normal.db";
 	};
 };
diff --git a/bin/tests/system/addzone/ns2/named3.conf.in b/bin/tests/system/addzone/ns2/named3.conf.in
index 4afb0a783f..f4d948e267 100644
--- a/bin/tests/system/addzone/ns2/named3.conf.in
+++ b/bin/tests/system/addzone/ns2/named3.conf.in
@@ -37,7 +37,7 @@ view internal {
 	};
 
 	zone "policy" {
-		type master;
+		type primary;
 		file "normal.db";
 	};
 };
diff --git a/bin/tests/system/addzone/ns3/named1.conf.in b/bin/tests/system/addzone/ns3/named1.conf.in
index f6f382b549..2ee5e26091 100644
--- a/bin/tests/system/addzone/ns3/named1.conf.in
+++ b/bin/tests/system/addzone/ns3/named1.conf.in
@@ -26,10 +26,10 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "redirect.db";
 };
 
-primaries "testmaster" {
+primaries "test" {
 	192.5.5.241;
 };
diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index c7fc95f0d9..cec70e823d 100755
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -53,7 +53,7 @@ fi
 
 echo_i "adding new zone ($n)"
 ret=0
-$RNDCCMD 10.53.0.2 addzone 'added.example { type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
+$RNDCCMD 10.53.0.2 addzone 'added.example { type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
 _check_adding_new_zone () (
 	$DIG $DIGOPTS @10.53.0.2 a.added.example a > dig.out.ns2.$n &&
 	grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
@@ -84,7 +84,8 @@ status=`expr $status + $ret`
 
 echo_i "adding a zone that requires quotes ($n)"
 ret=0
-$RNDCCMD 10.53.0.2 addzone '"32/1.0.0.127-in-addr.added.example" { check-names ignore; type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
+$RNDCCMD 10.53.0.2 addzone '"32/1.0.0.127-in-addr.added.example" {
+check-names ignore; type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
 _check_zone_that_requires_quotes() (
 	$DIG $DIGOPTS @10.53.0.2 "a.32/1.0.0.127-in-addr.added.example" a > dig.out.ns2.$n &&
 	grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
@@ -97,7 +98,7 @@ status=`expr $status + $ret`
 
 echo_i "adding a zone with a quote in the name ($n)"
 ret=0
-$RNDCCMD 10.53.0.2 addzone '"foo\"bar.example" { check-names ignore; type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
+$RNDCCMD 10.53.0.2 addzone '"foo\"bar.example" { check-names ignore; type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
 _check_zone_with_a_quote() (
 	$DIG $DIGOPTS @10.53.0.2 "a.foo\"bar.example" a > dig.out.ns2.$n &&
 	grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
@@ -108,11 +109,11 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "adding new zone with missing master file ($n)"
+echo_i "adding new zone with missing file ($n)"
 ret=0
 $DIG $DIGOPTS +all @10.53.0.2 a.missing.example a > dig.out.ns2.pre.$n || ret=1
 grep "status: REFUSED" dig.out.ns2.pre.$n > /dev/null || ret=1
-$RNDCCMD 10.53.0.2 addzone 'missing.example { type master; file "missing.db"; };' 2> rndc.out.ns2.$n
+$RNDCCMD 10.53.0.2 addzone 'missing.example { type primary; file "missing.db"; };' 2> rndc.out.ns2.$n
 grep "file not found" rndc.out.ns2.$n > /dev/null || ret=1
 $DIG $DIGOPTS +all @10.53.0.2 a.missing.example a > dig.out.ns2.post.$n || ret=1
 grep "status: REFUSED" dig.out.ns2.post.$n > /dev/null || ret=1
@@ -134,7 +135,7 @@ fi
 echo_i "checking rndc showzone with previously added zone ($n)"
 ret=0
 $RNDCCMD 10.53.0.2 showzone previous.example > rndc.out.ns2.$n
-expected='zone "previous.example" { type master; file "previous.db"; };'
+expected='zone "previous.example" { type primary; file "previous.db"; };'
 [ "`cat rndc.out.ns2.$n`" = "$expected" ] || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -212,7 +213,7 @@ status=`expr $status + $ret`
 echo_i "checking rndc showzone with a normally-loaded zone ($n)"
 ret=0
 $RNDCCMD 10.53.0.2 showzone normal.example > rndc.out.ns2.$n
-expected='zone "normal.example" { type master; file "normal.db"; };'
+expected='zone "normal.example" { type primary; file "normal.db"; };'
 [ "`cat rndc.out.ns2.$n`" = "$expected" ] || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -221,7 +222,7 @@ status=`expr $status + $ret`
 echo_i "checking rndc showzone with a normally-loaded zone with trailing dot ($n)"
 ret=0
 $RNDCCMD 10.53.0.2 showzone finaldot.example > rndc.out.ns2.$n
-expected='zone "finaldot.example." { type master; file "normal.db"; };'
+expected='zone "finaldot.example." { type primary; file "normal.db"; };'
 [ "`cat rndc.out.ns2.$n`" = "$expected" ] || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -271,79 +272,79 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "attempting to add master zone with inline signing ($n)"
-$RNDCCMD 10.53.0.2 addzone 'inline.example { type master; file "inline.db"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
-_check_add_master_zone_with_inline() (
+echo_i "attempting to add primary zone with inline signing ($n)"
+$RNDCCMD 10.53.0.2 addzone 'inline.example { type primary; file "inline.db"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
+_check_add_primary_zone_with_inline() (
 	$DIG $DIGOPTS @10.53.0.2 a.inline.example a > dig.out.ns2.$n &&
 	grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
 	grep '^a.inline.example' dig.out.ns2.$n > /dev/null
 )
-retry_quiet 5 _check_add_master_zone_with_inline || ret=1
+retry_quiet 5 _check_add_primary_zone_with_inline || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "attempting to add master zone with inline signing and missing master ($n)"
+echo_i "attempting to add primary zone with inline signing and missing file ($n)"
 ret=0
-$RNDCCMD 10.53.0.2 addzone 'inlinemissing.example { type master; file "missing.db"; inline-signing yes; };' 2> rndc.out.ns2.$n
+$RNDCCMD 10.53.0.2 addzone 'inlinemissing.example { type primary; file "missing.db"; inline-signing yes; };' 2> rndc.out.ns2.$n
 grep "file not found" rndc.out.ns2.$n > /dev/null || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "attempting to add slave zone with inline signing ($n)"
-$RNDCCMD 10.53.0.2 addzone 'inlineslave.example { type slave; masters { 10.53.0.1; }; file "inlineslave.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
-_check_add_slave_with_inline() (
-	$DIG $DIGOPTS @10.53.0.2 a.inlineslave.example a > dig.out.ns2.$n &&
+echo_i "attempting to add secondary zone with inline signing ($n)"
+$RNDCCMD 10.53.0.2 addzone 'inlinesec.example { type secondary; primaries { 10.53.0.1; }; file "inlinesec.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
+_check_add_secondary_with_inline() (
+	$DIG $DIGOPTS @10.53.0.2 a.inlinesec.example a > dig.out.ns2.$n &&
 	grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
-	grep '^a.inlineslave.example' dig.out.ns2.$n > /dev/null
+	grep '^a.inlinesec.example' dig.out.ns2.$n > /dev/null
 )
-retry_quiet 5 _check_add_slave_with_inline || ret=1
+retry_quiet 5 _check_add_secondary_with_inline || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "attempting to delete slave zone with inline signing ($n)"
+echo_i "attempting to delete secondary zone with inline signing ($n)"
 ret=0
-retry_quiet 10 test -f ns2/inlineslave.bk.signed -a -f ns2/inlineslave.bk || ret=1
-$RNDCCMD 10.53.0.2 delzone inlineslave.example > rndc.out2.test$n 2>&1 || ret=1
-test -f inlineslave.bk ||
-grep '^inlineslave.bk$' rndc.out2.test$n > /dev/null || {
-	echo_i "failed to report inlineslave.bk"; ret=1;
+retry_quiet 10 test -f ns2/inlinesec.bk.signed -a -f ns2/inlinesec.bk || ret=1
+$RNDCCMD 10.53.0.2 delzone inlinesec.example > rndc.out2.test$n 2>&1 || ret=1
+test -f inlinesec.bk ||
+grep '^inlinesec.bk$' rndc.out2.test$n > /dev/null || {
+	echo_i "failed to report inlinesec.bk"; ret=1;
 }
-test ! -f inlineslave.bk.signed ||
-grep '^inlineslave.bk.signed$' rndc.out2.test$n > /dev/null || {
-	echo_i "failed to report inlineslave.bk.signed"; ret=1;
+test ! -f inlinesec.bk.signed ||
+grep '^inlinesec.bk.signed$' rndc.out2.test$n > /dev/null || {
+	echo_i "failed to report inlinesec.bk.signed"; ret=1;
 }
 n=`expr $n + 1`
 status=`expr $status + $ret`
 
-echo_i "restoring slave zone with inline signing ($n)"
-$RNDCCMD 10.53.0.2 addzone 'inlineslave.example { type slave; masters { 10.53.0.1; }; file "inlineslave.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
-_check_restoring_slave_with_inline() (
-	$DIG $DIGOPTS @10.53.0.2 a.inlineslave.example a > dig.out.ns2.$n &&
+echo_i "restoring secondary zone with inline signing ($n)"
+$RNDCCMD 10.53.0.2 addzone 'inlinesec.example { type secondary; primaries { 10.53.0.1; }; file "inlinesec.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
+_check_restoring_secondary_with_inline() (
+	$DIG $DIGOPTS @10.53.0.2 a.inlinesec.example a > dig.out.ns2.$n &&
 	grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
-	grep '^a.inlineslave.example' dig.out.ns2.$n > /dev/null
+	grep '^a.inlinesec.example' dig.out.ns2.$n > /dev/null
 )
-retry_quiet 5 _check_restoring_slave_with_inline || ret=1
+retry_quiet 5 _check_restoring_secondary_with_inline || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "deleting slave zone with automatic zone file removal ($n)"
+echo_i "deleting secondary zone with automatic zone file removal ($n)"
 ret=0
-retry_quiet 10 test -f ns2/inlineslave.bk.signed -a -f ns2/inlineslave.bk || ret=1
-$RNDCCMD 10.53.0.2 delzone -clean inlineslave.example > /dev/null 2>&1
-retry_quiet 10 test ! -f ns2/inlineslave.bk.signed -a ! -f ns2/inlineslave.bk
+retry_quiet 10 test -f ns2/inlinesec.bk.signed -a -f ns2/inlinesec.bk || ret=1
+$RNDCCMD 10.53.0.2 delzone -clean inlinesec.example > /dev/null 2>&1
+retry_quiet 10 test ! -f ns2/inlinesec.bk.signed -a ! -f ns2/inlinesec.bk
 n=`expr $n + 1`
 status=`expr $status + $ret`
 
 echo_i "modifying zone configuration ($n)"
 ret=0
-$RNDCCMD 10.53.0.2 addzone 'mod.example { type master; file "added.db"; };' 2>&1 | sed 's/^/ns2 /' | cat_i
+$RNDCCMD 10.53.0.2 addzone 'mod.example { type primary; file "added.db"; };' 2>&1 | sed 's/^/ns2 /' | cat_i
 $DIG +norec $DIGOPTS @10.53.0.2 mod.example ns > dig.out.ns2.1.$n || ret=1
 grep 'status: NOERROR' dig.out.ns2.1.$n > /dev/null || ret=1
-$RNDCCMD 10.53.0.2 modzone 'mod.example { type master; file "added.db"; allow-query { none; }; };' 2>&1 | sed 's/^/ns2 /' | cat_i
+$RNDCCMD 10.53.0.2 modzone 'mod.example { type primary; file "added.db"; allow-query { none; }; };' 2>&1 | sed 's/^/ns2 /' | cat_i
 $DIG +norec $DIGOPTS @10.53.0.2 mod.example ns > dig.out.ns2.2.$n || ret=1
 $RNDCCMD 10.53.0.2 showzone mod.example | grep 'allow-query { "none"; };' > /dev/null 2>&1 || ret=1
 n=`expr $n + 1`
@@ -352,7 +353,7 @@ status=`expr $status + $ret`
 
 echo_i "check that adding a 'stub' zone works ($n)"
 ret=0
-$RNDCCMD 10.53.0.2 addzone 'stub.example { type stub; masters { 1.2.3.4; }; file "stub.example.bk"; };' > rndc.out.ns2.$n 2>&1 || ret=1
+$RNDCCMD 10.53.0.2 addzone 'stub.example { type stub; primaries { 1.2.3.4; }; file "stub.example.bk"; };' > rndc.out.ns2.$n 2>&1 || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
@@ -364,22 +365,22 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "check that adding a 'master redirect' zone works ($n)"
+echo_i "check that adding a 'primary redirect' zone works ($n)"
 ret=0
 $RNDCCMD 10.53.0.2 addzone '"." { type redirect; file "redirect.db"; };' > rndc.out.ns2.$n 2>&1 || ret=1
-_check_add_master_redirect() (
+_check_add_primary_redirect() (
 	$RNDCCMD 10.53.0.2 showzone -redirect > showzone.out.ns2.$n 2>&1 &&
 	grep "type redirect;" showzone.out.ns2.$n > /dev/null &&
 	$RNDCCMD 10.53.0.2 zonestatus -redirect > zonestatus.out.ns2.$n 2>&1 &&
 	grep "type: redirect" zonestatus.out.ns2.$n > /dev/null &&
 	grep "serial: 0" zonestatus.out.ns2.$n > /dev/null
 )
-retry_quiet 10 _check_add_master_redirect || ret=1
+retry_quiet 10 _check_add_primary_redirect || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "check that reloading a added 'master redirect' zone works ($n)"
+echo_i "check that reloading a added 'primary redirect' zone works ($n)"
 ret=0
 sleep 1
 cp -f ns2/redirect.db.2 ns2/redirect.db
@@ -389,63 +390,63 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "check that retransfer of a added 'master redirect' zone fails ($n)"
+echo_i "check that retransfer of a added 'primary redirect' zone fails ($n)"
 ret=0
 $RNDCCMD 10.53.0.2 retransfer -redirect > rndc.out.ns2.$n 2>&1 && ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "check that deleting a 'master redirect' zone works ($n)"
+echo_i "check that deleting a 'primary redirect' zone works ($n)"
 ret=0
 $RNDCCMD 10.53.0.2 delzone -redirect > rndc.out.ns2.$n 2>&1 || ret=1
-_check_deleting_master_redirect() (
+_check_deleting_primary_redirect() (
 	$RNDCCMD 10.53.0.2 showzone -redirect > showzone.out.ns2.$n 2>&1 || true
 	grep 'not found' showzone.out.ns2.$n > /dev/null
 )
-retry_quiet 10 _check_deleting_master_redirect || ret=1
+retry_quiet 10 _check_deleting_primary_redirect || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "check that adding a 'slave redirect' zone works ($n)"
+echo_i "check that adding a 'secondary redirect' zone works ($n)"
 ret=0
-$RNDCCMD 10.53.0.2 addzone '"." { type redirect; masters { 10.53.0.3;}; file "redirect.bk"; };' > rndc.out.ns2.$n 2>&1 || ret=1
-_check_adding_slave_redirect() (
+$RNDCCMD 10.53.0.2 addzone '"." { type redirect; primaries { 10.53.0.3;}; file "redirect.bk"; };' > rndc.out.ns2.$n 2>&1 || ret=1
+_check_adding_secondary_redirect() (
 	$RNDCCMD 10.53.0.2 showzone -redirect > showzone.out.ns2.$n 2>&1 &&
 	grep "type redirect;" showzone.out.ns2.$n > /dev/null &&
 	$RNDCCMD 10.53.0.2 zonestatus -redirect > zonestatus.out.ns2.$n 2>&1 &&
 	grep "type: redirect" zonestatus.out.ns2.$n > /dev/null &&
 	grep "serial: 0" zonestatus.out.ns2.$n > /dev/null
 )
-retry_quiet 10 _check_adding_slave_redirect || ret=1
+retry_quiet 10 _check_adding_secondary_redirect || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "check that retransfering a added 'slave redirect' zone works ($n)"
+echo_i "check that retransfering a added 'secondary redirect' zone works ($n)"
 ret=0
 cp -f ns3/redirect.db.2 ns3/redirect.db
 $RNDCCMD 10.53.0.3 reload . > showzone.out.ns3.$n 2>&1 || ret=1
-_check_retransfering_slave_redirect() (
+_check_retransfering_secondary_redirect() (
 	$RNDCCMD 10.53.0.2 retransfer -redirect > rndc.out.ns2.$n 2>&1 &&
 	$RNDCCMD 10.53.0.2 zonestatus -redirect > zonestatus.out.ns2.$n 2>&1 &&
 	grep "type: redirect" zonestatus.out.ns2.$n > /dev/null &&
 	grep "serial: 1" zonestatus.out.ns2.$n > /dev/null
 )
-retry_quiet 10 _check_retransfering_slave_redirect || ret=1
+retry_quiet 10 _check_retransfering_secondary_redirect || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "check that deleting a 'slave redirect' zone works ($n)"
+echo_i "check that deleting a 'secondary redirect' zone works ($n)"
 ret=0
 $RNDCCMD 10.53.0.2 delzone -redirect > rndc.out.ns2.$n 2>&1 || ret=1
-_check_deleting_slave_redirect() (
+_check_deleting_secondary_redirect() (
 	$RNDCCMD 10.53.0.2 showzone -redirect > showzone.out.ns2.$n 2>&1 || true
 	grep 'not found' showzone.out.ns2.$n > /dev/null
 )
-retry_quiet 10 _check_deleting_slave_redirect || ret=1
+retry_quiet 10 _check_deleting_secondary_redirect || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
@@ -499,7 +500,7 @@ $DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int
 grep 'status: NOERROR' dig.out.ns2.intpre.$n > /dev/null || ret=1
 $DIG +norec $DIGOPTS @10.53.0.4 -b 10.53.0.4 a.added.example a > dig.out.ns2.extpre.$n || ret=1
 grep 'status: REFUSED' dig.out.ns2.extpre.$n > /dev/null || ret=1
-$RNDCCMD 10.53.0.2 addzone 'added.example in external { type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
+$RNDCCMD 10.53.0.2 addzone 'added.example in external { type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
 $DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int.$n || ret=1
 grep 'status: NOERROR' dig.out.ns2.int.$n > /dev/null || ret=1
 $DIG +norec $DIGOPTS @10.53.0.4 -b 10.53.0.4 a.added.example a > dig.out.ns2.ext.$n || ret=1
@@ -546,9 +547,9 @@ status=`expr $status + $ret`
 echo_i "checking rndc showzone with newly added zone ($n)"
 _check_rndc_showzone_newly_added() (
 	if [ -z "$NZD" ]; then
-		expected='zone "added.example" in external { type master; file "added.db"; };'
+		expected='zone "added.example" in external { type primary; file "added.db"; };'
 	else
-		expected='zone "added.example" { type master; file "added.db"; };'
+		expected='zone "added.example" { type primary; file "added.db"; };'
 	fi
 	$RNDCCMD 10.53.0.2 showzone added.example in external > rndc.out.ns2.$n 2>/dev/null &&
 	[ "`cat rndc.out.ns2.$n`" = "$expected" ]
@@ -575,7 +576,7 @@ echo_i "attempting to add zone to internal view ($n)"
 ret=0
 $DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.pre.$n || ret=1
 grep 'status: NOERROR' dig.out.ns2.pre.$n > /dev/null || ret=1
-$RNDCCMD 10.53.0.2 addzone 'added.example in internal { type master; file "added.db"; };' 2> rndc.out.ns2.$n
+$RNDCCMD 10.53.0.2 addzone 'added.example in internal { type primary; file "added.db"; };' 2> rndc.out.ns2.$n
 grep "permission denied" rndc.out.ns2.$n > /dev/null || ret=1
 $DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int.$n || ret=1
 grep 'status: NOERROR' dig.out.ns2.int.$n > /dev/null || ret=1
@@ -595,7 +596,7 @@ status=`expr $status + $ret`
 
 echo_i "adding new zone again to external view ($n)"
 ret=0
-$RNDCCMD 10.53.0.2 addzone 'added.example in external { type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
+$RNDCCMD 10.53.0.2 addzone 'added.example in external { type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
 _check_adding_new_zone_again_external() (
 	$DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int.$n &&
 	grep 'status: NOERROR' dig.out.ns2.int.$n > /dev/null &&
@@ -640,7 +641,7 @@ $DIG +norec $DIGOPTS @10.53.0.4 -b 10.53.0.4 a.added.example a > dig.out.ns2.ext
 grep 'status: REFUSED' dig.out.ns2.extpre.$n > /dev/null || ret=1
 $DIG +norec $DIGOPTS @10.53.0.5 -b 10.53.0.5 a.added.example a > dig.out.ns2.dirpre.$n || ret=1
 grep 'status: REFUSED' dig.out.ns2.dirpre.$n > /dev/null || ret=1
-$RNDCCMD 10.53.0.2 addzone 'added.example in directory { type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
+$RNDCCMD 10.53.0.2 addzone 'added.example in directory { type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
 $DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int.$n || ret=1
 grep 'status: NOERROR' dig.out.ns2.int.$n > /dev/null || ret=1
 $DIG +norec $DIGOPTS @10.53.0.4 -b 10.53.0.4 a.added.example a > dig.out.ns2.ext.$n || ret=1
@@ -686,10 +687,10 @@ status=`expr $status + $ret`
 
 echo_i "check delzone after reconfig failure ($n)"
 ret=0
-$RNDCCMD 10.53.0.3 addzone 'inlineslave.example. IN { type slave; file "inlineslave.db"; masterfile-format text; primaries { testmaster; }; };' > /dev/null 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 addzone 'inlinesec.example. IN { type secondary; file "inlinesec.db"; masterfile-format text; primaries { test; }; };' > /dev/null 2>&1 || ret=1
 copy_setports ns3/named2.conf.in ns3/named.conf
 rndc_reconfig ns3 10.53.0.3
-$RNDCCMD 10.53.0.3 delzone inlineslave.example > /dev/null 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 delzone inlinesec.example > /dev/null 2>&1 || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
@@ -698,9 +699,9 @@ if ! $FEATURETEST --with-lmdb
 then
     echo_i "check that addzone is fully reversed on failure (--with-lmdb=no) ($n)"
     ret=0
-    $RNDCCMD 10.53.0.3 addzone "test1.baz" '{ type master; file "e.db"; };' > /dev/null 2>&1 || ret=1
-    $RNDCCMD 10.53.0.3 addzone "test2.baz" '{ type master; file "dne.db"; };' > /dev/null 2>&1 && ret=1
-    $RNDCCMD 10.53.0.3 addzone "test3.baz" '{ type master; file "e.db"; };' > /dev/null 2>&1 || ret=1
+    $RNDCCMD 10.53.0.3 addzone "test1.baz" '{ type primary; file "e.db"; };' > /dev/null 2>&1 || ret=1
+    $RNDCCMD 10.53.0.3 addzone "test2.baz" '{ type primary; file "dne.db"; };' > /dev/null 2>&1 && ret=1
+    $RNDCCMD 10.53.0.3 addzone "test3.baz" '{ type primary; file "e.db"; };' > /dev/null 2>&1 || ret=1
     $RNDCCMD 10.53.0.3 delzone "test3.baz" > /dev/null 2>&1 || ret=1
     grep test2.baz ns3/_default.nzf > /dev/null && ret=1
     n=`expr $n + 1`
@@ -715,13 +716,13 @@ _check_version_bind() (
 
 echo_i "check that named restarts with multiple added zones ($n)"
 ret=0
-$RNDCCMD 10.53.0.3 addzone "test4.baz" '{ type master; file "e.db"; };' > /dev/null 2>&1 || ret=1
-$RNDCCMD 10.53.0.3 addzone "test5.baz" '{ type master; file "e.db"; };' > /dev/null 2>&1 || ret=1
-$RNDCCMD 10.53.0.3 addzone '"test/.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
-$RNDCCMD 10.53.0.3 addzone '"test\".baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
-$RNDCCMD 10.53.0.3 addzone '"test\\.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
-$RNDCCMD 10.53.0.3 addzone '"test\032.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
-$RNDCCMD 10.53.0.3 addzone '"test\010.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 addzone "test4.baz" '{ type primary; file "e.db"; };' > /dev/null 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 addzone "test5.baz" '{ type primary; file "e.db"; };' > /dev/null 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 addzone '"test/.baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 addzone '"test\".baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 addzone '"test\\.baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 addzone '"test\032.baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 addzone '"test\010.baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
 stop_server addzone ns3
 start_server --noclean --restart --port ${PORT} addzone ns3 || ret=1
 retry_quiet 10 _check_version_bind || ret=1
diff --git a/bin/tests/system/allow-query/ns1/named.conf.in b/bin/tests/system/allow-query/ns1/named.conf.in
index 607925b26e..70e4d01cc2 100644
--- a/bin/tests/system/allow-query/ns1/named.conf.in
+++ b/bin/tests/system/allow-query/ns1/named.conf.in
@@ -18,6 +18,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named01.conf.in b/bin/tests/system/allow-query/ns2/named01.conf.in
index 0395d9c9de..faadc62936 100644
--- a/bin/tests/system/allow-query/ns2/named01.conf.in
+++ b/bin/tests/system/allow-query/ns2/named01.conf.in
@@ -25,6 +25,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named02.conf.in b/bin/tests/system/allow-query/ns2/named02.conf.in
index 3b0726ff89..758aa602bb 100644
--- a/bin/tests/system/allow-query/ns2/named02.conf.in
+++ b/bin/tests/system/allow-query/ns2/named02.conf.in
@@ -26,6 +26,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named03.conf.in b/bin/tests/system/allow-query/ns2/named03.conf.in
index 9d5fb48bdc..d7d7d4f008 100644
--- a/bin/tests/system/allow-query/ns2/named03.conf.in
+++ b/bin/tests/system/allow-query/ns2/named03.conf.in
@@ -26,6 +26,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named04.conf.in b/bin/tests/system/allow-query/ns2/named04.conf.in
index 88ee8de60d..67938b5f4e 100644
--- a/bin/tests/system/allow-query/ns2/named04.conf.in
+++ b/bin/tests/system/allow-query/ns2/named04.conf.in
@@ -26,6 +26,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named05.conf.in b/bin/tests/system/allow-query/ns2/named05.conf.in
index 7fbc72006d..77b16461fb 100644
--- a/bin/tests/system/allow-query/ns2/named05.conf.in
+++ b/bin/tests/system/allow-query/ns2/named05.conf.in
@@ -26,6 +26,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named06.conf.in b/bin/tests/system/allow-query/ns2/named06.conf.in
index c4a0b9fe5d..94f1a3fc05 100644
--- a/bin/tests/system/allow-query/ns2/named06.conf.in
+++ b/bin/tests/system/allow-query/ns2/named06.conf.in
@@ -26,6 +26,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named07.conf.in b/bin/tests/system/allow-query/ns2/named07.conf.in
index 511e74c5eb..2752bab934 100644
--- a/bin/tests/system/allow-query/ns2/named07.conf.in
+++ b/bin/tests/system/allow-query/ns2/named07.conf.in
@@ -28,6 +28,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named08.conf.in b/bin/tests/system/allow-query/ns2/named08.conf.in
index b0c3c6cd1d..316b1bbfbd 100644
--- a/bin/tests/system/allow-query/ns2/named08.conf.in
+++ b/bin/tests/system/allow-query/ns2/named08.conf.in
@@ -28,6 +28,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named09.conf.in b/bin/tests/system/allow-query/ns2/named09.conf.in
index 4f1d026d07..211c8bff7b 100644
--- a/bin/tests/system/allow-query/ns2/named09.conf.in
+++ b/bin/tests/system/allow-query/ns2/named09.conf.in
@@ -28,6 +28,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named10.conf.in b/bin/tests/system/allow-query/ns2/named10.conf.in
index c5f38c90bb..7d43e364bb 100644
--- a/bin/tests/system/allow-query/ns2/named10.conf.in
+++ b/bin/tests/system/allow-query/ns2/named10.conf.in
@@ -31,6 +31,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.in
index 56e5cc4947..295251880d 100644
--- a/bin/tests/system/allow-query/ns2/named11.conf.in
+++ b/bin/tests/system/allow-query/ns2/named11.conf.in
@@ -37,6 +37,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named12.conf.in b/bin/tests/system/allow-query/ns2/named12.conf.in
index 8381950dfa..0c01071987 100644
--- a/bin/tests/system/allow-query/ns2/named12.conf.in
+++ b/bin/tests/system/allow-query/ns2/named12.conf.in
@@ -31,6 +31,6 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
diff --git a/bin/tests/system/allow-query/ns2/named21.conf.in b/bin/tests/system/allow-query/ns2/named21.conf.in
index c5ba1e8050..5d09497b26 100644
--- a/bin/tests/system/allow-query/ns2/named21.conf.in
+++ b/bin/tests/system/allow-query/ns2/named21.conf.in
@@ -27,7 +27,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named22.conf.in b/bin/tests/system/allow-query/ns2/named22.conf.in
index 03907ffb8b..8b738992d9 100644
--- a/bin/tests/system/allow-query/ns2/named22.conf.in
+++ b/bin/tests/system/allow-query/ns2/named22.conf.in
@@ -29,7 +29,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 
diff --git a/bin/tests/system/allow-query/ns2/named23.conf.in b/bin/tests/system/allow-query/ns2/named23.conf.in
index 448b46297a..46f9013dfa 100644
--- a/bin/tests/system/allow-query/ns2/named23.conf.in
+++ b/bin/tests/system/allow-query/ns2/named23.conf.in
@@ -29,7 +29,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named24.conf.in b/bin/tests/system/allow-query/ns2/named24.conf.in
index 401e0f4291..f4309fe797 100644
--- a/bin/tests/system/allow-query/ns2/named24.conf.in
+++ b/bin/tests/system/allow-query/ns2/named24.conf.in
@@ -29,7 +29,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named25.conf.in b/bin/tests/system/allow-query/ns2/named25.conf.in
index 03304028f2..5d1418882d 100644
--- a/bin/tests/system/allow-query/ns2/named25.conf.in
+++ b/bin/tests/system/allow-query/ns2/named25.conf.in
@@ -29,7 +29,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named26.conf.in b/bin/tests/system/allow-query/ns2/named26.conf.in
index 15b0b24757..0bbdc4868d 100644
--- a/bin/tests/system/allow-query/ns2/named26.conf.in
+++ b/bin/tests/system/allow-query/ns2/named26.conf.in
@@ -29,7 +29,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named27.conf.in b/bin/tests/system/allow-query/ns2/named27.conf.in
index 4519f7b187..4f6c9c7f5a 100644
--- a/bin/tests/system/allow-query/ns2/named27.conf.in
+++ b/bin/tests/system/allow-query/ns2/named27.conf.in
@@ -31,7 +31,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 
diff --git a/bin/tests/system/allow-query/ns2/named28.conf.in b/bin/tests/system/allow-query/ns2/named28.conf.in
index 4b54a72e80..408d49deec 100644
--- a/bin/tests/system/allow-query/ns2/named28.conf.in
+++ b/bin/tests/system/allow-query/ns2/named28.conf.in
@@ -31,7 +31,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named29.conf.in b/bin/tests/system/allow-query/ns2/named29.conf.in
index 93a1e67e62..8bd63deeb8 100644
--- a/bin/tests/system/allow-query/ns2/named29.conf.in
+++ b/bin/tests/system/allow-query/ns2/named29.conf.in
@@ -31,7 +31,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named30.conf.in b/bin/tests/system/allow-query/ns2/named30.conf.in
index 0e5ff55b95..4c172929ca 100644
--- a/bin/tests/system/allow-query/ns2/named30.conf.in
+++ b/bin/tests/system/allow-query/ns2/named30.conf.in
@@ -34,7 +34,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.in
index faadb3f02f..a2690a4523 100644
--- a/bin/tests/system/allow-query/ns2/named31.conf.in
+++ b/bin/tests/system/allow-query/ns2/named31.conf.in
@@ -41,7 +41,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named32.conf.in b/bin/tests/system/allow-query/ns2/named32.conf.in
index 9e78dd0387..a0708c8ee3 100644
--- a/bin/tests/system/allow-query/ns2/named32.conf.in
+++ b/bin/tests/system/allow-query/ns2/named32.conf.in
@@ -34,7 +34,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named33.conf.in b/bin/tests/system/allow-query/ns2/named33.conf.in
index f4ba389a72..d11956db3b 100644
--- a/bin/tests/system/allow-query/ns2/named33.conf.in
+++ b/bin/tests/system/allow-query/ns2/named33.conf.in
@@ -30,7 +30,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 
diff --git a/bin/tests/system/allow-query/ns2/named34.conf.in b/bin/tests/system/allow-query/ns2/named34.conf.in
index 5e05e6c8b7..ff16428175 100644
--- a/bin/tests/system/allow-query/ns2/named34.conf.in
+++ b/bin/tests/system/allow-query/ns2/named34.conf.in
@@ -30,7 +30,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 };
diff --git a/bin/tests/system/allow-query/ns2/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.in
index f4bc3993e9..687768ea38 100644
--- a/bin/tests/system/allow-query/ns2/named40.conf.in
+++ b/bin/tests/system/allow-query/ns2/named40.conf.in
@@ -39,67 +39,67 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 };
 
 zone "any.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { any; };
 };
 
 zone "none.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { none; };
 };
 
 zone "addrallow.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { 10.53.0.2; };
 };
 
 zone "addrnotallow.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { 10.53.0.1; };
 };
 
 zone "addrdisallow.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { ! 10.53.0.2; };
 };
 
 zone "aclallow.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { accept; };
 };
 
 zone "aclnotallow.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { badaccept; };
 };
 
 zone "acldisallow.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { ! accept; };
 };
 
 /* Also usable for testing key not allowed */
 zone "keyallow.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { key one; };
 };
 
 zone "keydisallow.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { ! key one; };
 };
diff --git a/bin/tests/system/allow-query/ns2/named53.conf.in b/bin/tests/system/allow-query/ns2/named53.conf.in
index 5dac2b993f..59e1485343 100644
--- a/bin/tests/system/allow-query/ns2/named53.conf.in
+++ b/bin/tests/system/allow-query/ns2/named53.conf.in
@@ -26,7 +26,7 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { any; };
 };
diff --git a/bin/tests/system/allow-query/ns2/named54.conf.in b/bin/tests/system/allow-query/ns2/named54.conf.in
index 7014a75efa..d96c24eed9 100644
--- a/bin/tests/system/allow-query/ns2/named54.conf.in
+++ b/bin/tests/system/allow-query/ns2/named54.conf.in
@@ -26,7 +26,7 @@ zone "." {
 };
 
 zone "normal.example" {
-	type master;
+	type primary;
 	file "generic.db";
 	allow-query { none; };
 };
diff --git a/bin/tests/system/allow-query/ns2/named55.conf.in b/bin/tests/system/allow-query/ns2/named55.conf.in
index 058d223f44..8e336b5e7c 100644
--- a/bin/tests/system/allow-query/ns2/named55.conf.in
+++ b/bin/tests/system/allow-query/ns2/named55.conf.in
@@ -29,7 +29,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 		allow-query { any; };
 	};
diff --git a/bin/tests/system/allow-query/ns2/named56.conf.in b/bin/tests/system/allow-query/ns2/named56.conf.in
index beeb9cd70e..6c82c360ea 100644
--- a/bin/tests/system/allow-query/ns2/named56.conf.in
+++ b/bin/tests/system/allow-query/ns2/named56.conf.in
@@ -29,7 +29,7 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 		allow-query { none; };
 	};
diff --git a/bin/tests/system/allow-query/ns2/named57.conf.in b/bin/tests/system/allow-query/ns2/named57.conf.in
index c1e77cb9bd..cce8de7f47 100644
--- a/bin/tests/system/allow-query/ns2/named57.conf.in
+++ b/bin/tests/system/allow-query/ns2/named57.conf.in
@@ -28,12 +28,12 @@ view "internal" {
 	};
 
 	zone "normal.example" {
-		type master;
+		type primary;
 		file "generic.db";
 	};
 
 	zone "aclnotallow.example" {
-		type master;
+		type primary;
 		file "generic.db";
 		allow-query-on { none; };
 	};
diff --git a/bin/tests/system/allow-query/tests.sh b/bin/tests/system/allow-query/tests.sh
index a119220c42..0ba574a04e 100644
--- a/bin/tests/system/allow-query/tests.sh
+++ b/bin/tests/system/allow-query/tests.sh
@@ -45,9 +45,9 @@
 # In zone, with view set to none, zone set to any
 # In zone, with view set to any, zone set to none
 #
-# zone types of master, slave and stub can be tested in parallel by using
-# multiple instances (ns2 as master, ns3 as slave, ns4 as stub) and querying
-# as necessary.
+# zone types of primary, secondary and stub can be tested in parallel by
+# using multiple instances (ns2 as primary, ns3 as secondary, ns4 as stub)
+# and querying as necessary.
 #
 
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/auth/ns1/named.conf.in b/bin/tests/system/auth/ns1/named.conf.in
index 1cddc49403..38dbcd2749 100644
--- a/bin/tests/system/auth/ns1/named.conf.in
+++ b/bin/tests/system/auth/ns1/named.conf.in
@@ -23,19 +23,19 @@ options {
 
 view main in {
 	zone example.net {
-		type master;
+		type primary;
 		file "example.net.db";
 	};
 
 	zone example.com {
-		type master;
+		type primary;
 		file "example.com.db";
 	};
 };
 
 view alt chaos {
 	zone example.chaos chaos {
-		type master;
+		type primary;
 		file "chaos.db";
 	};
 };
diff --git a/bin/tests/system/auth/ns2/named.conf.in b/bin/tests/system/auth/ns2/named.conf.in
index 89b4d4c503..f2b8b853fb 100644
--- a/bin/tests/system/auth/ns2/named.conf.in
+++ b/bin/tests/system/auth/ns2/named.conf.in
@@ -22,13 +22,13 @@ options {
 };
 
 zone example.net {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "example.net.bk";
 };
 
 zone example.com {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "example.com.bk";
 };
diff --git a/bin/tests/system/autosign/ns1/named.conf.in b/bin/tests/system/autosign/ns1/named.conf.in
index 426482d3ba..0c3a4bf6b8 100644
--- a/bin/tests/system/autosign/ns1/named.conf.in
+++ b/bin/tests/system/autosign/ns1/named.conf.in
@@ -34,7 +34,7 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 	allow-transfer { any; };
 	allow-query { any; };
diff --git a/bin/tests/system/autosign/ns2/named.conf.in b/bin/tests/system/autosign/ns2/named.conf.in
index b56c294d96..5cdf863a1a 100644
--- a/bin/tests/system/autosign/ns2/named.conf.in
+++ b/bin/tests/system/autosign/ns2/named.conf.in
@@ -40,7 +40,7 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-query { any; };
 	allow-transfer { any; };
@@ -49,7 +49,7 @@ zone "example" {
 };
 
 zone "bar" {
-	type master;
+	type primary;
 	file "bar.db";
 	allow-query { any; };
 	allow-transfer { any; };
@@ -59,7 +59,7 @@ zone "bar" {
 };
 
 zone "private.secure.example" {
-	type master;
+	type primary;
 	file "private.secure.example.db";
 	allow-query { any; };
 	allow-transfer { any; };
@@ -68,7 +68,7 @@ zone "private.secure.example" {
 };
 
 zone "insecure.secure.example" {
-	type master;
+	type primary;
 	file "insecure.secure.example.db";
 	allow-query { any; };
 	allow-transfer { any; };
@@ -77,7 +77,7 @@ zone "insecure.secure.example" {
 };
 
 zone "child.nsec3.example" {
-	type master;
+	type primary;
 	file "child.nsec3.example.db";
 	allow-query { any; };
 	allow-transfer { any; };
@@ -86,7 +86,7 @@ zone "child.nsec3.example" {
 };
 
 zone "child.optout.example" {
-	type master;
+	type primary;
 	file "child.optout.example.db";
 	allow-query { any; };
 	allow-transfer { any; };
diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in
index 141a3b8e7a..7c8f74f19a 100644
--- a/bin/tests/system/autosign/ns3/named.conf.in
+++ b/bin/tests/system/autosign/ns3/named.conf.in
@@ -44,59 +44,59 @@ zone "." {
 };
 
 zone "example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	file "example.bk";
 };
 
 zone "bar" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	file "bar.bk";
 };
 
 zone "secure.example" {
-	type master;
+	type primary;
 	file "secure.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "insecure.example" {
-	type master;
+	type primary;
 	file "insecure.example.db";
 };
 
 zone "nsec3.example" {
-	type master;
+	type primary;
 	file "nsec3.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "autonsec3.example" {
-	type master;
+	type primary;
 	file "autonsec3.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "optout.nsec3.example" {
-	type master;
+	type primary;
 	file "optout.nsec3.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "nsec3.nsec3.example" {
-	type master;
+	type primary;
 	file "nsec3.nsec3.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "jitter.nsec3.example" {
-	type master;
+	type primary;
 	file "jitter.nsec3.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
@@ -106,77 +106,77 @@ zone "jitter.nsec3.example" {
 };
 
 zone "secure.nsec3.example" {
-	type master;
+	type primary;
 	file "secure.nsec3.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "optout.example" {
-	type master;
+	type primary;
 	file "optout.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "secure.optout.example" {
-	type master;
+	type primary;
 	file "secure.optout.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "nsec3.optout.example" {
-	type master;
+	type primary;
 	file "nsec3.optout.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "optout.optout.example" {
-	type master;
+	type primary;
 	file "optout.optout.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "rsasha256.example" {
-	type master;
+	type primary;
 	file "rsasha256.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "rsasha512.example" {
-	type master;
+	type primary;
 	file "rsasha512.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "nsec.example" {
-	type master;
+	type primary;
 	file "nsec.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "nsec3-to-nsec.example" {
-	type master;
+	type primary;
 	file "nsec3-to-nsec.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "secure-to-insecure.example" {
-	type master;
+	type primary;
 	file "secure-to-insecure.example.db";
 	allow-update { any; };
 	dnssec-secure-to-insecure yes;
 };
 
 zone "secure-to-insecure2.example" {
-	type master;
+	type primary;
 	file "secure-to-insecure2.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
@@ -184,7 +184,7 @@ zone "secure-to-insecure2.example" {
 };
 
 zone "oldsigs.example" {
-	type master;
+	type primary;
 	file "oldsigs.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
@@ -194,70 +194,70 @@ zone "oldsigs.example" {
 };
 
 zone "prepub.example" {
-	type master;
+	type primary;
 	file "prepub.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "ttl1.example" {
-	type master;
+	type primary;
 	file "ttl1.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "ttl2.example" {
-	type master;
+	type primary;
 	file "ttl2.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "ttl3.example" {
-	type master;
+	type primary;
 	file "ttl3.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "ttl4.example" {
-	type master;
+	type primary;
 	file "ttl4.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "delay.example" {
-	type master;
+	type primary;
 	file "delay.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "nozsk.example" {
-	type master;
+	type primary;
 	file "nozsk.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "inaczsk.example" {
-	type master;
+	type primary;
 	file "inaczsk.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "sync.example" {
-	type master;
+	type primary;
 	file "sync.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "kskonly.example" {
-	type master;
+	type primary;
 	file "kskonly.example.db";
 	allow-update { any; };
 	dnssec-dnskey-kskonly yes;
@@ -265,7 +265,7 @@ zone "kskonly.example" {
 };
 
 zone "inacksk2.example" {
-	type master;
+	type primary;
 	file "inacksk2.example.db";
 	allow-update { any; };
 	dnssec-dnskey-kskonly yes;
@@ -273,7 +273,7 @@ zone "inacksk2.example" {
 };
 
 zone "inacksk3.example" {
-	type master;
+	type primary;
 	file "inacksk3.example.db";
 	allow-update { any; };
 	dnssec-dnskey-kskonly yes;
@@ -281,28 +281,28 @@ zone "inacksk3.example" {
 };
 
 zone "inaczsk2.example" {
-	type master;
+	type primary;
 	file "inaczsk2.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "inaczsk3.example" {
-	type master;
+	type primary;
 	file "inaczsk3.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "delzsk.example." {
-	type master;
+	type primary;
 	file "delzsk.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
 };
 
 zone "dname-at-apex-nsec3.example" {
-	type master;
+	type primary;
 	file "dname-at-apex-nsec3.example.db";
 	allow-update { any; };
 	auto-dnssec maintain;
diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 39458fa452..6cd45cb73f 100755
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -1359,11 +1359,11 @@ status=`expr $status + $ret`
 echo_i "test turning on auto-dnssec during reconfig ($n)"
 ret=0
 # first create a zone that doesn't have auto-dnssec
-($RNDCCMD 10.53.0.3 addzone reconf.example '{ type master; file "reconf.example.db"; };' 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
+($RNDCCMD 10.53.0.3 addzone reconf.example '{ type primary; file "reconf.example.db"; };' 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
 rekey_calls=`grep "zone reconf.example.*next key event" ns3/named.run | wc -l`
 [ "$rekey_calls" -eq 0 ] || ret=1
 # ...then we add auto-dnssec and reconfigure
-($RNDCCMD 10.53.0.3 modzone reconf.example '{ type master; file "reconf.example.db"; allow-update { any; }; auto-dnssec maintain; };' 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
+($RNDCCMD 10.53.0.3 modzone reconf.example '{ type primary; file "reconf.example.db"; allow-update { any; }; auto-dnssec maintain; };' 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
 rndc_reconfig ns3 10.53.0.3
 for i in 0 1 2 3 4 5 6 7 8 9; do
     lret=0
diff --git a/bin/tests/system/cacheclean/ns1/named.conf.in b/bin/tests/system/cacheclean/ns1/named.conf.in
index c1ce07e071..2f9234cc72 100644
--- a/bin/tests/system/cacheclean/ns1/named.conf.in
+++ b/bin/tests/system/cacheclean/ns1/named.conf.in
@@ -25,16 +25,16 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "flushtest.example" {
-	type master;
+	type primary;
 	file "flushtest.db";
 };
 
 zone "expire-test" {
-	type master;
+	type primary;
 	file "expire-test.db";
 };
diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index c608db31ce..4979f325d0 100644
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -44,6 +44,6 @@ zone "flushtest.example" {
 };
 
 zone "expire-test" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 };
diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
index 302c621eb3..da3a4dba6a 100755
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -246,7 +246,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "check expire option returned from master zone ($n)"
+echo_i "check expire option returned from primary zone ($n)"
 ret=0
 $DIG @10.53.0.1 -p ${PORT} +expire soa expire-test > dig.out.expire
 grep EXPIRE: dig.out.expire > /dev/null || ret=1
@@ -254,7 +254,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "check expire option returned from slave zone ($n)"
+echo_i "check expire option returned from secondary zone ($n)"
 ret=0
 $DIG @10.53.0.2 -p ${PORT} +expire soa expire-test > dig.out.expire
 grep EXPIRE: dig.out.expire > /dev/null || ret=1
diff --git a/bin/tests/system/case/ns1/named.conf.in b/bin/tests/system/case/ns1/named.conf.in
index f2310562bf..c13ac69816 100644
--- a/bin/tests/system/case/ns1/named.conf.in
+++ b/bin/tests/system/case/ns1/named.conf.in
@@ -25,13 +25,13 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	also-notify { 10.53.0.2; };
 };
 
 zone "dynamic" {
-	type master;
+	type primary;
 	file "dynamic.db";
 	allow-update { any; };
 	also-notify { 10.53.0.2; };
diff --git a/bin/tests/system/case/ns2/named.conf.in b/bin/tests/system/case/ns2/named.conf.in
index 145f106e44..00dc52625f 100644
--- a/bin/tests/system/case/ns2/named.conf.in
+++ b/bin/tests/system/case/ns2/named.conf.in
@@ -26,13 +26,13 @@ options {
 };
 
 zone "example" {
-	type slave;
+	type secondary;
 	file "example.bk";
 	primaries { 10.53.0.1; };
 };
 
 zone "dynamic" {
-	type slave;
+	type secondary;
 	file "dynamic.bk";
 	primaries { 10.53.0.1; };
 };
diff --git a/bin/tests/system/case/tests.sh b/bin/tests/system/case/tests.sh
index 1d75acb888..3669183f7c 100644
--- a/bin/tests/system/case/tests.sh
+++ b/bin/tests/system/case/tests.sh
@@ -105,7 +105,7 @@ test $ret -eq 0 || echo_i "failed"
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "check SOA owner case is transferred to slave ($n)"
+echo_i "check SOA owner case is transferred to secondary ($n)"
 ret=0
 $DIG $DIGOPTS axfr dynamic @10.53.0.2 > dig.ns2.test$n
 digcomp dig.ns2.test$n postupdate.good || ret=1
@@ -137,7 +137,7 @@ test $ret -eq 0 || echo_i "failed"
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "check A owner case is transferred to slave ($n)"
+echo_i "check A owner case is transferred to secondary ($n)"
 ret=0
 $DIG $DIGOPTS axfr dynamic @10.53.0.2 > dig.ns2.test$n
 digcomp dig.ns2.test$n postns1.good || ret=1
diff --git a/bin/tests/system/catz/ns1/named.conf.in b/bin/tests/system/catz/ns1/named.conf.in
index 74b7d371b7..121866910a 100644
--- a/bin/tests/system/catz/ns1/named.conf.in
+++ b/bin/tests/system/catz/ns1/named.conf.in
@@ -31,7 +31,7 @@ options {
 };
 
 zone "catalog1.example" {
-	type master;
+	type primary;
 	file "catalog1.example.db";
 	allow-transfer { any; };
 	allow-update { any; };
@@ -40,7 +40,7 @@ zone "catalog1.example" {
 };
 
 zone "catalog3.example" {
-	type master;
+	type primary;
 	file "catalog3.example.db";
 	allow-transfer { any; };
 	allow-update { any; };
@@ -49,7 +49,7 @@ zone "catalog3.example" {
 };
 
 zone "catalog4.example" {
-	type master;
+	type primary;
 	file "catalog4.example.db";
 	allow-transfer { any; };
 	allow-update { any; };
diff --git a/bin/tests/system/catz/ns2/named.conf.in b/bin/tests/system/catz/ns2/named.conf.in
index 55a6ae62a4..30333e6e1b 100644
--- a/bin/tests/system/catz/ns2/named.conf.in
+++ b/bin/tests/system/catz/ns2/named.conf.in
@@ -45,25 +45,25 @@ options {
 };
 
 zone "catalog1.example" {
-	type slave;
+	type secondary;
 	file "catalog1.example.db";
 	primaries { 10.53.0.1; };
 };
 
 zone "catalog2.example" {
-	type slave;
+	type secondary;
 	file "catalog2.example.db";
 	primaries { 10.53.0.3; };
 };
 
 zone "catalog3.example" {
-	type slave;
+	type secondary;
 	file "catalog3.example.db";
 	primaries { 10.53.0.1; };
 };
 
 zone "catalog4.example" {
-	type slave;
+	type secondary;
 	file "catalog4.example.db";
 	primaries { 10.53.0.1; };
 };
diff --git a/bin/tests/system/catz/ns3/named.conf.in b/bin/tests/system/catz/ns3/named.conf.in
index d5ee7c87ad..9ec5e0f23f 100644
--- a/bin/tests/system/catz/ns3/named.conf.in
+++ b/bin/tests/system/catz/ns3/named.conf.in
@@ -30,7 +30,7 @@ options {
 };
 
 zone "catalog2.example" {
-	type master;
+	type primary;
 	file "catalog2.example.db";
 	allow-transfer { any; };
 	allow-update { any; };
@@ -39,7 +39,7 @@ zone "catalog2.example" {
 };
 
 zone "dom5.example" {
-	type master;
+	type primary;
 	file "dom5.example.db";
 	allow-transfer { any; };
 	allow-update { any; };
@@ -47,7 +47,7 @@ zone "dom5.example" {
 };
 
 zone "dom6.example" {
-	type master;
+	type primary;
 	file "dom6.example.db";
 	allow-transfer { any; };
 	allow-update { any; };
diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index db533fc7a9..c79540c4cb 100644
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -81,23 +81,23 @@ n=0
 ##########################################################################
 echo_i "Testing adding/removing of domain in catalog zone"
 n=$((n+1))
-echo_i "checking that dom1.example. is not served by master ($n)"
+echo_i "checking that dom1.example. is not served by primary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.1 dom1.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding a domain dom1.example. to master via RNDC ($n)"
+echo_i "Adding a domain dom1.example. to primary via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom1.example.db
 echo "@ IN NS invalid." >> ns1/dom1.example.db
-rndccmd 10.53.0.1 addzone dom1.example. '{type master; file "dom1.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom1.example. '{type primary; file "dom1.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom1.example. is now served by master ($n)"
+echo_i "checking that dom1.example. is now served by primary ($n)"
 ret=0
 wait_for_soa @10.53.0.1 dom1.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -117,7 +117,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run "catz: adding zone 'dom1.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run "transfer of 'dom1.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@@ -125,7 +125,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom1.example. is served by slave ($n)"
+echo_i "checking that dom1.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom1.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -150,14 +150,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run "zone_shutdown: zone dom1.example/IN: shutting down" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom1.example. is not served by slave ($n)"
+echo_i "checking that dom1.example. is not served by secondary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.2 dom1.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -173,20 +173,20 @@ status=$((status+ret))
 ##########################################################################
 echo_i "Testing various simple operations on domains, including using multiple catalog zones and garbage in zone"
 n=$((n+1))
-echo_i "adding domain dom2.example. to master via RNDC ($n)"
+echo_i "adding domain dom2.example. to primary via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom2.example.db
 echo "@ IN NS invalid." >> ns1/dom2.example.db
-rndccmd 10.53.0.1 addzone dom2.example. '{type master; file "dom2.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom2.example. '{type primary; file "dom2.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "adding domain dom4.example. to master via RNDC ($n)"
+echo_i "adding domain dom4.example. to primary via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom4.example.db
 echo "@ IN NS invalid." >> ns1/dom4.example.db
-rndccmd 10.53.0.1 addzone dom4.example. '{type master; file "dom4.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom4.example. '{type primary; file "dom4.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
@@ -225,7 +225,7 @@ status=$((status+ret))
 
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run "catz: adding zone 'dom4.example' from catalog 'catalog2.example'" &&
 wait_for_message ns2/named.run "transfer of 'dom4.example/IN' from 10.53.0.1#${EXTRAPORT1}: Transfer status: success" || ret=1
@@ -233,7 +233,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom4.example. is served by slave ($n)"
+echo_i "checking that dom4.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom4.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -241,30 +241,30 @@ status=$((status+ret))
 
 
 n=$((n+1))
-echo_i "checking that dom3.example. is not served by master ($n)"
+echo_i "checking that dom3.example. is not served by primary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.1 dom3.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "adding a domain dom3.example. to master via RNDC ($n)"
+echo_i "adding a domain dom3.example. to primary via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom3.example.db
 echo "@ IN NS invalid." >> ns1/dom3.example.db
-rndccmd 10.53.0.1 addzone dom3.example. '{type master; file "dom3.example.db"; also-notify { 10.53.0.2; }; notify explicit; };' || ret=1
+rndccmd 10.53.0.1 addzone dom3.example. '{type primary; file "dom3.example.db"; also-notify { 10.53.0.2; }; notify explicit; };' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom3.example. is served by master ($n)"
+echo_i "checking that dom3.example. is served by primary ($n)"
 ret=0
 wait_for_soa  @10.53.0.1 dom3.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run "catz: adding zone 'dom2.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run "catz: adding zone 'dom3.example' from catalog 'catalog1.example'" &&
@@ -274,7 +274,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom3.example. is served by slave ($n)"
+echo_i "checking that dom3.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom3.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -328,7 +328,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'dom5.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run  "transfer of 'dom5.example/IN' from 10.53.0.3#${PORT}: Transfer status: success" || ret=1
@@ -336,7 +336,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom5.example. is served by slave ($n)"
+echo_i "checking that dom5.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom5.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -355,14 +355,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "zone_shutdown: zone dom5.example/IN: shutting down" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom5.example. is no longer served by slave ($n)"
+echo_i "checking that dom5.example. is no longer served by secondary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.2 dom5.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -385,7 +385,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'dom6.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run  "transfer of 'dom6.example/IN' from " > /dev/null || ret=1
@@ -393,7 +393,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom6.example. is served by slave ($n)"
+echo_i "checking that dom6.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom6.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -413,14 +413,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "zone_shutdown: zone dom6.example/IN: shutting down" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom6.example. is no longer served by slave ($n)"
+echo_i "checking that dom6.example. is no longer served by secondary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.2 dom6.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -441,7 +441,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'dom6.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run  "error \"failure\" while trying to generate config for zone \"dom6.example\"" || ret=1
@@ -461,7 +461,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: deleting zone 'dom6.example' from catalog 'catalog1.example' - success" > /dev/null || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -478,21 +478,21 @@ status=$((status+ret))
 ##########################################################################
 echo_i "Testing allow-query and allow-transfer ACLs"
 n=$((n+1))
-echo_i "adding domains dom7.example. and dom8.example. to master via RNDC ($n)"
+echo_i "adding domains dom7.example. and dom8.example. to primary via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom7.example.db
 echo "@ IN NS invalid." >> ns1/dom7.example.db
-rndccmd 10.53.0.1 addzone dom7.example. '{type master; file "dom7.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom7.example. '{type primary; file "dom7.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom8.example.db
 echo "@ IN NS invalid." >> ns1/dom8.example.db
-rndccmd 10.53.0.1 addzone dom8.example. '{type master; file "dom8.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom8.example. '{type primary; file "dom8.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom7.example. is now served by master ($n)"
+echo_i "checking that dom7.example. is now served by primary ($n)"
 ret=0
 wait_for_soa @10.53.0.1 dom7.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -513,7 +513,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'dom7.example' from catalog 'catalog1.example'" > /dev/null &&
 wait_for_message ns2/named.run  "transfer of 'dom7.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@@ -556,7 +556,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: update_from_db: new zone merged" &&
 wait_for_message ns2/named.run  "transfer of 'dom8.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@@ -644,16 +644,16 @@ status=$((status+ret))
 ##########################################################################
 echo_i "Testing TSIG keys for masters set per-domain"
 n=$((n+1))
-echo_i "adding a domain dom9.example. to master via RNDC, with transfers allowed only with TSIG key ($n)"
+echo_i "adding a domain dom9.example. to primary via RNDC, with transfers allowed only with TSIG key ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom9.example.db
 echo "@ IN NS invalid." >> ns1/dom9.example.db
-rndccmd 10.53.0.1 addzone dom9.example. '{type master; file "dom9.example.db"; allow-transfer { key tsig_key; }; };' || ret=1
+rndccmd 10.53.0.1 addzone dom9.example. '{type primary; file "dom9.example.db"; allow-transfer { key tsig_key; }; };' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom9.example. is now served by master ($n)"
+echo_i "checking that dom9.example. is now served by primary ($n)"
 ret=0
 wait_for_soa @10.53.0.1 dom9.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -675,7 +675,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'dom9.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run  "transfer of 'dom9.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@@ -683,7 +683,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom9.example. is accessible on slave ($n)"
+echo_i "checking that dom9.example. is accessible on secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom9.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -703,14 +703,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: deleting zone 'dom9.example' from catalog 'catalog1.example' - success" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom9.example. is no longer accessible on slave ($n)"
+echo_i "checking that dom9.example. is no longer accessible on secondary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.2 dom9.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -731,7 +731,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'dom9.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run  "error \"failure\" while trying to generate config for zone \"dom9.example\"" || ret=1
@@ -751,7 +751,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: deleting zone 'dom9.example' from catalog 'catalog1.example'" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -790,23 +790,23 @@ do
     esac
 
     n=$((n+1))
-    echo_i "checking that ${special}. is not served by master ($n)"
+    echo_i "checking that ${special}. is not served by primary ($n)"
     ret=0
     wait_for_no_soa @10.53.0.1 "${special}" dig.out.test$n || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
     status=$((status+ret))
 
     n=$((n+1))
-    echo_i "Adding a domain ${special}. to master via RNDC ($n)"
+    echo_i "Adding a domain ${special}. to primary via RNDC ($n)"
     ret=0
     echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom10.example.db
     echo "@ IN NS invalid." >> ns1/dom10.example.db
-    rndccmd 10.53.0.1 addzone '"'"${special}"'"' '{type master; file "dom10.example.db";};' || ret=1
+    rndccmd 10.53.0.1 addzone '"'"${special}"'"' '{type primary; file "dom10.example.db";};' || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
     status=$((status+ret))
 
     n=$((n+1))
-    echo_i "checking that ${special}. is now served by master ($n)"
+    echo_i "checking that ${special}. is now served by primary ($n)"
     ret=0
     wait_for_soa @10.53.0.1 "${special}." dig.out.test$n || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -826,7 +826,7 @@ END
     status=$((status+ret))
 
     n=$((n+1))
-    echo_i "waiting for slave to sync up ($n)"
+    echo_i "waiting for secondary to sync up ($n)"
     ret=0
     wait_for_message ns2/named.run  "catz: adding zone '$special' from catalog 'catalog1.example'" &&
     wait_for_message ns2/named.run  "transfer of '$special/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@@ -834,7 +834,7 @@ END
     status=$((status+ret))
 
     n=$((n+1))
-    echo_i "checking that ${special}. is served by slave ($n)"
+    echo_i "checking that ${special}. is served by secondary ($n)"
     ret=0
     wait_for_soa @10.53.0.2 "${special}." dig.out.test$n || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -859,14 +859,14 @@ END
     status=$((status+ret))
 
     n=$((n+1))
-    echo_i "waiting for slave to sync up ($n)"
+    echo_i "waiting for secondary to sync up ($n)"
     ret=0
     wait_for_message ns2/named.run  "zone_shutdown: zone ${special}/IN: shutting down" || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
     status=$((status+ret))
 
     n=$((n+1))
-    echo_i "checking that ${special}. is not served by slave ($n)"
+    echo_i "checking that ${special}. is not served by secondary ($n)"
     ret=0
     wait_for_no_soa @10.53.0.2 "${special}." dig.out.test$n || ret=1
     if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -883,23 +883,23 @@ done
 ##########################################################################
 echo_i "Testing adding a domain and a subdomain of it"
 n=$((n+1))
-echo_i "checking that dom11.example. is not served by master ($n)"
+echo_i "checking that dom11.example. is not served by primary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.1 dom11.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding a domain dom11.example. to master via RNDC ($n)"
+echo_i "Adding a domain dom11.example. to primary via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom11.example.db
 echo "@ IN NS invalid." >> ns1/dom11.example.db
-rndccmd 10.53.0.1 addzone dom11.example. '{type master; file "dom11.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom11.example. '{type primary; file "dom11.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom11.example. is now served by master ($n)"
+echo_i "checking that dom11.example. is now served by primary ($n)"
 ret=0
 wait_for_soa @10.53.0.1 dom11.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -919,7 +919,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'dom11.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run  "transfer of 'dom11.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@@ -927,30 +927,30 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom11.example. is served by slave ($n)"
+echo_i "checking that dom11.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom11.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that subdomain.of.dom11.example. is not served by master ($n)"
+echo_i "checking that subdomain.of.dom11.example. is not served by primary ($n)"
 ret=0
 wait_for_rcode NXDOMAIN SOA @10.53.0.1 subdomain.of.dom11.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding a domain subdomain.of.dom11.example. to master via RNDC ($n)"
+echo_i "Adding a domain subdomain.of.dom11.example. to primary via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/subdomain.of.dom11.example.db
 echo "@ IN NS invalid." >> ns1/subdomain.of.dom11.example.db
-rndccmd 10.53.0.1 addzone subdomain.of.dom11.example. '{type master; file "subdomain.of.dom11.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone subdomain.of.dom11.example. '{type primary; file "subdomain.of.dom11.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that subdomain.of.dom11.example. is now served by master ($n)"
+echo_i "checking that subdomain.of.dom11.example. is now served by primary ($n)"
 ret=0
 wait_for_soa @10.53.0.1 subdomain.of.dom11.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -970,7 +970,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'subdomain.of.dom11.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run  "transfer of 'subdomain.of.dom11.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@@ -978,7 +978,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that subdomain.of.dom11.example. is served by slave ($n)"
+echo_i "checking that subdomain.of.dom11.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 subdomain.of.dom11.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -996,21 +996,21 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "zone_shutdown: zone dom11.example/IN: shutting down" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom11.example. is not served by slave ($n)"
+echo_i "checking that dom11.example. is not served by secondary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.2 dom11.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that subdomain.of.dom11.example. is still served by slave ($n)"
+echo_i "checking that subdomain.of.dom11.example. is still served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 subdomain.of.dom11.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1028,14 +1028,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "zone_shutdown: zone subdomain.of.dom11.example/IN: shutting down" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that subdomain.of.dom11.example. is not served by slave ($n)"
+echo_i "checking that subdomain.of.dom11.example. is not served by secondary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.2 subdomain.of.d11.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1044,23 +1044,23 @@ status=$((status+ret))
 ##########################################################################
 echo_i "Testing adding a catalog zone at runtime with rndc reconfig"
 n=$((n+1))
-echo_i "checking that dom12.example. is not served by master ($n)"
+echo_i "checking that dom12.example. is not served by primary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.1 dom12.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding a domain dom12.example. to master via RNDC ($n)"
+echo_i "Adding a domain dom12.example. to primary via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom12.example.db
 echo "@ IN NS invalid." >> ns1/dom12.example.db
-rndccmd 10.53.0.1 addzone dom12.example. '{type master; file "dom12.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom12.example. '{type primary; file "dom12.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom12.example. is now served by master ($n)"
+echo_i "checking that dom12.example. is now served by primary ($n)"
 ret=0
 wait_for_soa @10.53.0.1 dom12.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1080,7 +1080,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom12.example. is not served by slave ($n)"
+echo_i "checking that dom12.example. is not served by secondary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.2 dom12.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1088,7 +1088,7 @@ status=$((status+ret))
 
 
 n=$((n+1))
-echo_i "reconfiguring slave - adding catalog4 catalog zone ($n)"
+echo_i "reconfiguring secondary - adding catalog4 catalog zone ($n)"
 ret=0
 sed -e "s/^#T1//g" <  ns2/named.conf.in > ns2/named.conf.tmp
 copy_setports ns2/named.conf.tmp ns2/named.conf
@@ -1097,7 +1097,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'dom12.example' from catalog 'catalog4.example'" &&
 wait_for_message ns2/named.run  "transfer of 'dom12.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@@ -1105,21 +1105,21 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom7.example. is still served by slave after reconfiguration ($n)"
+echo_i "checking that dom7.example. is still served by secondary after reconfiguration ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom7.example. dig.out.test$n -b 10.53.0.1 || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 n=$((n+1))
 
-echo_i "checking that dom12.example. is served by slave ($n)"
+echo_i "checking that dom12.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom12.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "reconfiguring slave - removing catalog4 catalog zone, adding non-existent catalog5 catalog zone ($n)"
+echo_i "reconfiguring secondary - removing catalog4 catalog zone, adding non-existent catalog5 catalog zone ($n)"
 ret=0
 sed -e "s/^#T2//" < ns2/named.conf.in > ns2/named.conf.tmp
 copy_setports ns2/named.conf.tmp ns2/named.conf
@@ -1128,7 +1128,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "reconfiguring slave - removing non-existent catalog5 catalog zone ($n)"
+echo_i "reconfiguring secondary - removing non-existent catalog5 catalog zone ($n)"
 ret=0
 copy_setports ns2/named.conf.in ns2/named.conf
 rndccmd 10.53.0.2 reconfig || ret=1
@@ -1136,7 +1136,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom12.example. is not served by slave ($n)"
+echo_i "checking that dom12.example. is not served by secondary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.2 dom12.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1156,41 +1156,41 @@ status=$((status+ret))
 ##########################################################################
 echo_i "Testing having a zone in two different catalogs"
 n=$((n+1))
-echo_i "checking that dom13.example. is not served by master ($n)"
+echo_i "checking that dom13.example. is not served by primary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.1 dom13.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding a domain dom13.example. to master ns1 via RNDC ($n)"
+echo_i "Adding a domain dom13.example. to primary ns1 via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom13.example.db
 echo "@ IN NS invalid." >> ns1/dom13.example.db
 echo "@ IN A 192.0.2.1" >> ns1/dom13.example.db
-rndccmd 10.53.0.1 addzone dom13.example. '{type master; file "dom13.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom13.example. '{type primary; file "dom13.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom13.example. is now served by master ns1 ($n)"
+echo_i "checking that dom13.example. is now served by primary ns1 ($n)"
 ret=0
 wait_for_soa @10.53.0.1 dom13.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding a domain dom13.example. to master ns3 via RNDC ($n)"
+echo_i "Adding a domain dom13.example. to primary ns3 via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns3/dom13.example.db
 echo "@ IN NS invalid." >> ns3/dom13.example.db
 echo "@ IN A 192.0.2.2" >> ns3/dom13.example.db
-rndccmd 10.53.0.3 addzone dom13.example. '{type master; file "dom13.example.db";};' || ret=1
+rndccmd 10.53.0.3 addzone dom13.example. '{type primary; file "dom13.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom13.example. is now served by master ns3 ($n)"
+echo_i "checking that dom13.example. is now served by primary ns3 ($n)"
 ret=0
 wait_for_soa @10.53.0.3 dom13.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1200,7 +1200,7 @@ status=$((status+ret))
 nextpart ns2/named.run >/dev/null
 
 n=$((n+1))
-echo_i "Adding domain dom13.example. to catalog1 zone with ns1 as master ($n)"
+echo_i "Adding domain dom13.example. to catalog1 zone with ns1 as primary ($n)"
 ret=0
 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
     server 10.53.0.1 ${PORT}
@@ -1212,7 +1212,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: adding zone 'dom13.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run  "transfer of 'dom13.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@@ -1222,7 +1222,7 @@ status=$((status+ret))
 nextpart ns2/named.run >/dev/null
 
 n=$((n+1))
-echo_i "checking that dom13.example. is served by slave and that it's the one from ns1 ($n)"
+echo_i "checking that dom13.example. is served by secondary and that it's the one from ns1 ($n)"
 ret=0
 wait_for_a @10.53.0.2 dom13.example. dig.out.test$n || ret=1
 grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@@ -1230,7 +1230,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding domain dom13.example. to catalog2 zone with ns3 as master ($n)"
+echo_i "Adding domain dom13.example. to catalog2 zone with ns3 as primary ($n)"
 ret=0
 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
     server 10.53.0.3 ${PORT}
@@ -1242,14 +1242,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: update_from_db: new zone merged" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom13.example. is served by slave and that it's still the one from ns1 ($n)"
+echo_i "checking that dom13.example. is served by secondary and that it's still the one from ns1 ($n)"
 ret=0
 wait_for_a @10.53.0.2 dom13.example. dig.out.test$n || ret=1
 grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@@ -1271,14 +1271,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: update_from_db: new zone merged" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom13.example. is served by slave and that it's still the one from ns1 ($n)"
+echo_i "checking that dom13.example. is served by secondary and that it's still the one from ns1 ($n)"
 ret=0
 wait_for_a @10.53.0.2 dom13.example. dig.out.test$n || ret=1
 grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@@ -1298,14 +1298,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: update_from_db: new zone merged" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom13.example. is no longer served by slave ($n)"
+echo_i "checking that dom13.example. is no longer served by secondary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.2 dom13.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1314,41 +1314,41 @@ status=$((status+ret))
 ##########################################################################
 echo_i "Testing having a regular zone and a zone in catalog zone of the same name"
 n=$((n+1))
-echo_i "checking that dom14.example. is not served by master ($n)"
+echo_i "checking that dom14.example. is not served by primary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.1 dom14.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding a domain dom14.example. to master ns1 via RNDC ($n)"
+echo_i "Adding a domain dom14.example. to primary ns1 via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom14.example.db
 echo "@ IN NS invalid." >> ns1/dom14.example.db
 echo "@ IN A 192.0.2.1" >> ns1/dom14.example.db
-rndccmd 10.53.0.1 addzone dom14.example. '{type master; file "dom14.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom14.example. '{type primary; file "dom14.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom14.example. is now served by master ns1 ($n)"
+echo_i "checking that dom14.example. is now served by primary ns1 ($n)"
 ret=0
 wait_for_soa @10.53.0.1 dom14.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding a domain dom14.example. to master ns3 via RNDC ($n)"
+echo_i "Adding a domain dom14.example. to primary ns3 via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns3/dom14.example.db
 echo "@ IN NS invalid." >> ns3/dom14.example.db
 echo "@ IN A 192.0.2.2" >> ns3/dom14.example.db
-rndccmd 10.53.0.3 addzone dom14.example. '{type master; file "dom14.example.db";};' || ret=1
+rndccmd 10.53.0.3 addzone dom14.example. '{type primary; file "dom14.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom14.example. is now served by master ns3 ($n)"
+echo_i "checking that dom14.example. is now served by primary ns3 ($n)"
 ret=0
 wait_for_soa @10.53.0.3 dom14.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1357,14 +1357,14 @@ status=$((status+ret))
 nextpart ns2/named.run >/dev/null
 
 n=$((n+1))
-echo_i "Adding domain dom14.example. with rndc with ns1 as master ($n)"
+echo_i "Adding domain dom14.example. with rndc with ns1 as primary ($n)"
 ret=0
-rndccmd 10.53.0.2 addzone dom14.example. '{type slave; masters {10.53.0.1;};};' || ret=1
+rndccmd 10.53.0.2 addzone dom14.example. '{type secondary; primaries {10.53.0.1;};};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "transfer of 'dom14.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1373,7 +1373,7 @@ status=$((status+ret))
 nextpart ns2/named.run >/dev/null
 
 n=$((n+1))
-echo_i "checking that dom14.example. is served by slave and that it's the one from ns1 ($n)"
+echo_i "checking that dom14.example. is served by secondary and that it's the one from ns1 ($n)"
 ret=0
 wait_for_a @10.53.0.2 dom14.example. dig.out.test$n || ret=1
 grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@@ -1381,7 +1381,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding domain dom14.example. to catalog2 zone with ns3 as master ($n)"
+echo_i "Adding domain dom14.example. to catalog2 zone with ns3 as primary ($n)"
 ret=0
 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
     server 10.53.0.3 ${PORT}
@@ -1393,14 +1393,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: update_from_db: new zone merged" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom14.example. is served by slave and that it's still the one from ns1 ($n)"
+echo_i "checking that dom14.example. is served by secondary and that it's still the one from ns1 ($n)"
 ret=0
 wait_for_a @10.53.0.2 dom14.example. dig.out.test$n || ret=1
 grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@@ -1422,14 +1422,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: update_from_db: new zone merged" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom14.example. is served by slave and that it's still the one from ns1 ($n)"
+echo_i "checking that dom14.example. is served by secondary and that it's still the one from ns1 ($n)"
 ret=0
 wait_for_a @10.53.0.2 dom14.example. dig.out.test$n || ret=1
 grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@@ -1439,23 +1439,23 @@ status=$((status+ret))
 ##########################################################################
 echo_i "Testing changing label for a member zone"
 n=$((n+1))
-echo_i "checking that dom15.example. is not served by master ($n)"
+echo_i "checking that dom15.example. is not served by primary ($n)"
 ret=0
 wait_for_no_soa @10.53.0.1 dom15.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "Adding a domain dom15.example. to master ns1 via RNDC ($n)"
+echo_i "Adding a domain dom15.example. to primary ns1 via RNDC ($n)"
 ret=0
 echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom15.example.db
 echo "@ IN NS invalid." >> ns1/dom15.example.db
-rndccmd 10.53.0.1 addzone dom15.example. '{type master; file "dom15.example.db";};' || ret=1
+rndccmd 10.53.0.1 addzone dom15.example. '{type primary; file "dom15.example.db";};' || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom15.example. is now served by master ns1 ($n)"
+echo_i "checking that dom15.example. is now served by primary ns1 ($n)"
 ret=0
 wait_for_soa @10.53.0.1 dom15.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1474,7 +1474,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: update_from_db: new zone merged" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1483,7 +1483,7 @@ status=$((status+ret))
 sleep 3
 
 n=$((n+1))
-echo_i "checking that dom15.example. is served by slave ($n)"
+echo_i "checking that dom15.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom15.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1504,14 +1504,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "waiting for slave to sync up ($n)"
+echo_i "waiting for secondary to sync up ($n)"
 ret=0
 wait_for_message ns2/named.run  "catz: update_from_db: new zone merged" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
-echo_i "checking that dom15.example. is served by slave ($n)"
+echo_i "checking that dom15.example. is served by secondary ($n)"
 ret=0
 wait_for_soa @10.53.0.2 dom15.example. dig.out.test$n || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
diff --git a/bin/tests/system/chain/ns1/named.conf.in b/bin/tests/system/chain/ns1/named.conf.in
index d55fb0d2eb..668af66eeb 100644
--- a/bin/tests/system/chain/ns1/named.conf.in
+++ b/bin/tests/system/chain/ns1/named.conf.in
@@ -22,4 +22,4 @@ options {
 	notify yes;
 };
 
-zone "." { type master; file "root.db"; };
+zone "." { type primary; file "root.db"; };
diff --git a/bin/tests/system/chain/ns2/named.conf.in b/bin/tests/system/chain/ns2/named.conf.in
index 024424fb85..69dd7dad27 100644
--- a/bin/tests/system/chain/ns2/named.conf.in
+++ b/bin/tests/system/chain/ns2/named.conf.in
@@ -25,28 +25,28 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db.signed";
 	allow-update { any; };
 };
 
 zone "sub2.example" {
-	type master;
+	type primary;
 	file "sub.db";
 };
 
 zone "signed-sub2.example" {
-	type master;
+	type primary;
 	file "sub.db";
 };
 
-zone "domain0.nil" { type master; file "generic.db"; };
-zone "domain1.nil" { type master; file "generic.db"; };
-zone "domain2.nil" { type master; file "generic.db"; };
-zone "domain3.nil" { type master; file "generic.db"; };
-zone "domain4.nil" { type master; file "generic.db"; };
-zone "domain5.nil" { type master; file "generic.db"; };
-zone "domain6.nil" { type master; file "generic.db"; };
-zone "domain7.nil" { type master; file "generic.db"; };
-zone "domain8.nil" { type master; file "generic.db"; };
-zone "domain9.nil" { type master; file "generic.db"; };
+zone "domain0.nil" { type primary; file "generic.db"; };
+zone "domain1.nil" { type primary; file "generic.db"; };
+zone "domain2.nil" { type primary; file "generic.db"; };
+zone "domain3.nil" { type primary; file "generic.db"; };
+zone "domain4.nil" { type primary; file "generic.db"; };
+zone "domain5.nil" { type primary; file "generic.db"; };
+zone "domain6.nil" { type primary; file "generic.db"; };
+zone "domain7.nil" { type primary; file "generic.db"; };
+zone "domain8.nil" { type primary; file "generic.db"; };
+zone "domain9.nil" { type primary; file "generic.db"; };
diff --git a/bin/tests/system/chain/ns5/named.conf.in b/bin/tests/system/chain/ns5/named.conf.in
index 14a05983bc..be34cfd445 100644
--- a/bin/tests/system/chain/ns5/named.conf.in
+++ b/bin/tests/system/chain/ns5/named.conf.in
@@ -30,11 +30,11 @@ zone "." {
 };
 
 zone "sub5.example" {
-	type master;
+	type primary;
 	file "sub.db";
 };
 
 zone "signed-sub5.example" {
-	type master;
+	type primary;
 	file "sub.db";
 };
diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index b2f5b7b22f..dc8f4b28a9 100644
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -168,8 +168,8 @@ EOF
     [ $? -eq 1 ] || { echo_i "options + view $field failed" ; ret=1; }
     cat > badzero.conf << EOF
 zone dummy {
-    type slave;
-    masters { 0.0.0.0; };
+    type secondary;
+    primaries { 0.0.0.0; };
     $field 0;
 };
 EOF
@@ -180,7 +180,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking options allowed in inline-signing slaves ($n)"
+echo_i "checking options allowed in inline-signing secondaries ($n)"
 ret=0
 $CHECKCONF bad-dnssec.conf > checkconf.out$n.1 2>&1
 l=`grep "dnssec-dnskey-kskonly.*requires inline" < checkconf.out$n.1 | wc -l`
@@ -195,7 +195,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "check file + inline-signing for slave zones ($n)"
+echo_i "check file + inline-signing for secondary zones ($n)"
 $CHECKCONF inline-no.conf > checkconf.out$n.1 2>&1
 l=`grep "missing 'file' entry" < checkconf.out$n.1 | wc -l`
 [ $l -eq 0 ] || ret=1
diff --git a/bin/tests/system/checknames/ns1/named.conf.in b/bin/tests/system/checknames/ns1/named.conf.in
index 4a557a15a8..11ddbc2f26 100644
--- a/bin/tests/system/checknames/ns1/named.conf.in
+++ b/bin/tests/system/checknames/ns1/named.conf.in
@@ -24,44 +24,44 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "ignore.example" {
-	type master;
+	type primary;
 	file "ignore.example.db";
 	check-names ignore;
 };
 
 zone "warn.example" {
-	type master;
+	type primary;
 	file "warn.example.db";
 	check-names warn;
 };
 
 zone "fail.example" {
-	type master;
+	type primary;
 	file "fail.example.db";
 	check-names fail;
 };
 
 zone "ignore.update" {
-	type master;
+	type primary;
 	file "ignore.update.db";
 	allow-update { any; };
 	check-names ignore;
 };
 
 zone "warn.update" {
-	type master;
+	type primary;
 	file "warn.update.db";
 	allow-update { any; };
 	check-names warn;
 };
 
 zone "fail.update" {
-	type master;
+	type primary;
 	file "fail.update.db";
 	allow-update { any; };
 	check-names fail;
diff --git a/bin/tests/system/checknames/ns4/named.conf.in b/bin/tests/system/checknames/ns4/named.conf.in
index 8ae4a8ecca..9043dbd381 100644
--- a/bin/tests/system/checknames/ns4/named.conf.in
+++ b/bin/tests/system/checknames/ns4/named.conf.in
@@ -29,7 +29,7 @@ zone "." {
 };
 
 zone "master-ignore.update" {
-	type master;
+	type primary;
 	file "master-ignore.update.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/cookie/ns1/named.conf.in b/bin/tests/system/cookie/ns1/named.conf.in
index 4d23c0eaad..2c0fa2b2b2 100644
--- a/bin/tests/system/cookie/ns1/named.conf.in
+++ b/bin/tests/system/cookie/ns1/named.conf.in
@@ -44,6 +44,6 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/cookie/ns2/named.conf.in b/bin/tests/system/cookie/ns2/named.conf.in
index 23425ccbdc..e1073f92b6 100644
--- a/bin/tests/system/cookie/ns2/named.conf.in
+++ b/bin/tests/system/cookie/ns2/named.conf.in
@@ -24,6 +24,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/cookie/ns3/named.conf.in b/bin/tests/system/cookie/ns3/named.conf.in
index 47fd6bafc2..abb688e0e3 100644
--- a/bin/tests/system/cookie/ns3/named.conf.in
+++ b/bin/tests/system/cookie/ns3/named.conf.in
@@ -45,6 +45,6 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/cookie/ns7/named.conf.in b/bin/tests/system/cookie/ns7/named.conf.in
index 9c25220b19..62ced15bb2 100644
--- a/bin/tests/system/cookie/ns7/named.conf.in
+++ b/bin/tests/system/cookie/ns7/named.conf.in
@@ -24,6 +24,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/cookie/ns8/named.conf.in b/bin/tests/system/cookie/ns8/named.conf.in
index 36bc29d2f3..c90a2b95dd 100644
--- a/bin/tests/system/cookie/ns8/named.conf.in
+++ b/bin/tests/system/cookie/ns8/named.conf.in
@@ -32,6 +32,6 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/database/ns1/named1.conf.in b/bin/tests/system/database/ns1/named1.conf.in
index b6c838ac2d..4d60860340 100644
--- a/bin/tests/system/database/ns1/named1.conf.in
+++ b/bin/tests/system/database/ns1/named1.conf.in
@@ -34,6 +34,6 @@ options {
 };
 
 zone "database" {
-	type master;
+	type primary;
 	database "_builtin empty localhost. hostmaster.isc.org.";
 };
diff --git a/bin/tests/system/database/ns1/named2.conf.in b/bin/tests/system/database/ns1/named2.conf.in
index 8b0c3f1938..3393548e81 100644
--- a/bin/tests/system/database/ns1/named2.conf.in
+++ b/bin/tests/system/database/ns1/named2.conf.in
@@ -34,6 +34,6 @@ options {
 };
 
 zone "database" {
-	type master;
+	type primary;
 	database "_builtin empty localhost. marka.isc.org.";
 };
diff --git a/bin/tests/system/delzone/clean.sh b/bin/tests/system/delzone/clean.sh
index 51b9e3d144..e71481368c 100644
--- a/bin/tests/system/delzone/clean.sh
+++ b/bin/tests/system/delzone/clean.sh
@@ -17,7 +17,7 @@ rm -f ns2/*.nzd ns2/*nzd-lock
 rm -f ns2/core*
 rm -f ns2/inline.db.jbk
 rm -f ns2/inline.db.signed
-rm -f ns2/inlineslave.bk*
+rm -f ns2/inlinesec.bk*
 rm -f ns*/named.lock
 rm -f ns2/nzf-*
 rm -f ns*/managed-keys.bind*
diff --git a/bin/tests/system/delzone/ns1/inlineslave.db b/bin/tests/system/delzone/ns1/inlinesec.db
similarity index 95%
rename from bin/tests/system/delzone/ns1/inlineslave.db
rename to bin/tests/system/delzone/ns1/inlinesec.db
index 625349ec4d..5db7e024e3 100644
--- a/bin/tests/system/delzone/ns1/inlineslave.db
+++ b/bin/tests/system/delzone/ns1/inlinesec.db
@@ -7,7 +7,7 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-$ORIGIN inlineslave.example.
+$ORIGIN inlinesec.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (
 				1          ; serial
diff --git a/bin/tests/system/delzone/ns1/named.conf b/bin/tests/system/delzone/ns1/named.conf
index 71cd514d3a..8cbe61d0b4 100644
--- a/bin/tests/system/delzone/ns1/named.conf
+++ b/bin/tests/system/delzone/ns1/named.conf
@@ -26,7 +26,7 @@ zone "." {
 	file "../../common/root.hint";
 };
 
-zone "inlineslave.example" {
-	type master;
-	file "inlineslave.db";
+zone "inlinesec.example" {
+	type primary;
+	file "inlinesec.db";
 };
diff --git a/bin/tests/system/digdelv/ns1/named.conf.in b/bin/tests/system/digdelv/ns1/named.conf.in
index 066e453d76..ff1317892e 100644
--- a/bin/tests/system/digdelv/ns1/named.conf.in
+++ b/bin/tests/system/digdelv/ns1/named.conf.in
@@ -23,6 +23,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/digdelv/ns2/named.conf.in b/bin/tests/system/digdelv/ns2/named.conf.in
index 8dafd87b3d..6a90c358de 100644
--- a/bin/tests/system/digdelv/ns2/named.conf.in
+++ b/bin/tests/system/digdelv/ns2/named.conf.in
@@ -27,6 +27,6 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.in b/bin/tests/system/dlzexternal/ns1/named.conf.in
index 89b21812fb..8eb46cc33f 100644
--- a/bin/tests/system/dlzexternal/ns1/named.conf.in
+++ b/bin/tests/system/dlzexternal/ns1/named.conf.in
@@ -62,7 +62,7 @@ dlz redzone {
 };
 
 zone zone.nil {
-	type master;
+	type primary;
 	dlz unsearched2;
 };
 
@@ -72,6 +72,6 @@ zone "." {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/dns64/ns1/named.conf.in b/bin/tests/system/dns64/ns1/named.conf.in
index 778c0bc9a5..900e9fae17 100644
--- a/bin/tests/system/dns64/ns1/named.conf.in
+++ b/bin/tests/system/dns64/ns1/named.conf.in
@@ -35,17 +35,17 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "signed" {
-	type master;
+	type primary;
 	file "signed.db.signed";
 };
 
diff --git a/bin/tests/system/dns64/ns2/named.conf.in b/bin/tests/system/dns64/ns2/named.conf.in
index 386a9d740b..47f937f978 100644
--- a/bin/tests/system/dns64/ns2/named.conf.in
+++ b/bin/tests/system/dns64/ns2/named.conf.in
@@ -64,6 +64,6 @@ zone "." {
 };
 
 zone "rpz" {
-	type master;
+	type primary;
 	file "rpz.db";
 };
diff --git a/bin/tests/system/dnssec/ns1/named.conf.in b/bin/tests/system/dnssec/ns1/named.conf.in
index 68d7993a2b..6f20491689 100644
--- a/bin/tests/system/dnssec/ns1/named.conf.in
+++ b/bin/tests/system/dnssec/ns1/named.conf.in
@@ -27,7 +27,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
 
diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in
index ebef86da9c..12465581cf 100644
--- a/bin/tests/system/dnssec/ns2/named.conf.in
+++ b/bin/tests/system/dnssec/ns2/named.conf.in
@@ -41,132 +41,132 @@ zone "." {
 };
 
 zone "trusted" {
-	type master;
+	type primary;
 	file "trusted.db.signed";
 };
 
 zone "managed" {
-	type master;
+	type primary;
 	file "managed.db.signed";
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db.signed";
 	allow-update { any; };
 };
 
 zone "insecure.secure.example" {
-	type master;
+	type primary;
 	file "insecure.secure.example.db";
 	allow-update { any; };
 };
 
 zone "rfc2335.example" {
-	type master;
+	type primary;
 	file "rfc2335.example.db";
 };
 
 zone "child.nsec3.example" {
-	type master;
+	type primary;
 	file "child.nsec3.example.db";
 	allow-update { none; };
 };
 
 zone "child.optout.example" {
-	type master;
+	type primary;
 	file "child.optout.example.db";
 	allow-update { none; };
 };
 
 zone "badparam" {
-	type master;
+	type primary;
 	file "badparam.db.bad";
 };
 
 zone "single-nsec3" {
-	type master;
+	type primary;
 	file "single-nsec3.db.signed";
 };
 
 zone "algroll" {
-	type master;
+	type primary;
 	file "algroll.db.signed";
 };
 
 zone "nsec3chain-test" {
-	type master;
+	type primary;
 	file "nsec3chain-test.db.signed";
 	allow-update {any;};
 };
 
 zone "in-addr.arpa" {
-	type master;
+	type primary;
 	file "in-addr.arpa.db.signed";
 };
 
 zone "cds.secure" {
-	type master;
+	type primary;
 	file "cds.secure.db.signed";
 };
 
 zone "cds-x.secure" {
-	type master;
+	type primary;
 	file "cds-x.secure.db.signed";
 };
 
 zone "cds-update.secure" {
-	type master;
+	type primary;
 	file "cds-update.secure.db.signed";
 	allow-update { any; };
 };
 
 zone "cds-kskonly.secure" {
-	type master;
+	type primary;
 	dnssec-dnskey-kskonly yes;
 	file "cds-kskonly.secure.db.signed";
 	allow-update { any; };
 };
 
 zone "cds-auto.secure" {
-	type master;
+	type primary;
 	file "cds-auto.secure.db.signed";
 	auto-dnssec maintain;
 	allow-update { any; };
 };
 
 zone "cdnskey.secure" {
-	type master;
+	type primary;
 	file "cdnskey.secure.db.signed";
 };
 
 zone "cdnskey-x.secure" {
-	type master;
+	type primary;
 	file "cdnskey-x.secure.db.signed";
 };
 
 zone "cdnskey-update.secure" {
-	type master;
+	type primary;
 	file "cdnskey-update.secure.db.signed";
 	allow-update { any; };
 };
 
 zone "cdnskey-kskonly.secure" {
-	type master;
+	type primary;
 	dnssec-dnskey-kskonly yes;
 	file "cdnskey-kskonly.secure.db.signed";
 	allow-update { any; };
 };
 
 zone "cdnskey-auto.secure" {
-	type master;
+	type primary;
 	file "cdnskey-auto.secure.db.signed";
 	auto-dnssec maintain;
 	allow-update { any; };
 };
 
 zone "updatecheck-kskonly.secure" {
-	type master;
+	type primary;
 	auto-dnssec maintain;
 	key-directory ".";
 	dnssec-dnskey-kskonly yes;
@@ -178,7 +178,7 @@ zone "updatecheck-kskonly.secure" {
 };
 
 zone "corp" {
-	type master;
+	type primary;
 	file "corp.db";
 };
 
diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in
index c632e7e9cf..196a13dd4e 100644
--- a/bin/tests/system/dnssec/ns3/named.conf.in
+++ b/bin/tests/system/dnssec/ns3/named.conf.in
@@ -41,325 +41,325 @@ zone "." {
 };
 
 zone "example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	file "example.bk";
 };
 
 zone "secure.example" {
-	type master;
+	type primary;
 	file "secure.example.db.signed";
 	allow-update { any; };
 };
 
 zone "bogus.example" {
-	type master;
+	type primary;
 	file "bogus.example.db.signed";
 	allow-update { any; };
 };
 
 zone "badds.example" {
-	type master;
+	type primary;
 	file "badds.example.db.signed";
 	allow-update { any; };
 };
 
 zone "dynamic.example" {
-	type master;
+	type primary;
 	file "dynamic.example.db.signed";
 	allow-update { any; };
 };
 
 zone "insecure.example" {
-	type master;
+	type primary;
 	file "insecure.example.db";
 	allow-update { any; };
 };
 
 zone "insecure.nsec3.example" {
-	type master;
+	type primary;
 	file "insecure.nsec3.example.db";
 	allow-update { any; };
 };
 
 zone "insecure.optout.example" {
-	type master;
+	type primary;
 	file "insecure.optout.example.db";
 	allow-update { any; };
 };
 
 zone "keyless.example" {
-	type master;
+	type primary;
 	file "keyless.example.db.signed";
 };
 
 zone "nsec3.example" {
-	type master;
+	type primary;
 	file "nsec3.example.db.signed";
 };
 
 zone "optout.nsec3.example" {
-	type master;
+	type primary;
 	file "optout.nsec3.example.db.signed";
 };
 
 zone "nsec3.nsec3.example" {
-	type master;
+	type primary;
 	file "nsec3.nsec3.example.db.signed";
 };
 
 zone "secure.nsec3.example" {
-	type master;
+	type primary;
 	file "secure.nsec3.example.db.signed";
 };
 
 zone "optout.example" {
-	type master;
+	type primary;
 	file "optout.example.db.signed";
 };
 
 zone "secure.optout.example" {
-	type master;
+	type primary;
 	file "secure.optout.example.db.signed";
 };
 
 zone "nsec3.optout.example" {
-	type master;
+	type primary;
 	file "nsec3.optout.example.db.signed";
 };
 
 zone "optout.optout.example" {
-	type master;
+	type primary;
 	file "optout.optout.example.db.signed";
 };
 
 zone "nsec3-unknown.example" {
-	type master;
+	type primary;
 	nsec3-test-zone yes;
 	file "nsec3-unknown.example.db.signed";
 };
 
 zone "optout-unknown.example" {
-	type master;
+	type primary;
 	nsec3-test-zone yes;
 	file "optout-unknown.example.db.signed";
 };
 
 zone "dnskey-unknown.example" {
-	type master;
+	type primary;
 	file "dnskey-unknown.example.db.signed";
 };
 
 zone "dnskey-unsupported.example" {
-	type master;
+	type primary;
 	file "dnskey-unsupported.example.db.signed";
 };
 
 zone "dnskey-unsupported-2.example" {
-	type master;
+	type primary;
 	file "dnskey-unsupported-2.example.db.signed";
 };
 
 zone "dnskey-nsec3-unknown.example" {
-	type master;
+	type primary;
 	nsec3-test-zone yes;
 	file "dnskey-nsec3-unknown.example.db.signed";
 };
 
 zone "multiple.example" {
-	type master;
+	type primary;
 	file "multiple.example.db.signed";
 	allow-update { any; };
 };
 
 zone "rfc2335.example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	file "rfc2335.example.bk";
 };
 
 zone "rsasha256.example" {
-	type master;
+	type primary;
 	file "rsasha256.example.db.signed";
 };
 
 zone "rsasha512.example" {
-	type master;
+	type primary;
 	file "rsasha512.example.db.signed";
 };
 
 zone "kskonly.example" {
-	type master;
+	type primary;
 	file "kskonly.example.db.signed";
 };
 
 zone "expired.example" {
-	type master;
+	type primary;
 	allow-update { none; };
 	file "expired.example.db.signed";
 };
 
 zone "update-nsec3.example" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "update-nsec3.example.db.signed";
 };
 
 zone "auto-nsec.example" {
-	type master;
+	type primary;
 	auto-dnssec maintain;
 	allow-update { !0.0.0.0; };
 	file "auto-nsec.example.db.signed";
 };
 
 zone "auto-nsec3.example" {
-	type master;
+	type primary;
 	auto-dnssec maintain;
 	allow-update { !0.0.0.0; };
 	file "auto-nsec3.example.db.signed";
 };
 
 zone "insecure.below-cname.example" {
-	type master;
+	type primary;
 	file "insecure.below-cname.example.db";
 };
 
 zone "secure.below-cname.example" {
-	type master;
+	type primary;
 	file "secure.below-cname.example.db.signed";
 };
 
 zone "ttlpatch.example" {
-	type master;
+	type primary;
 	file "ttlpatch.example.db.patched";
 };
 
 zone "split-dnssec.example" {
-	type master;
+	type primary;
 	file "split-dnssec.example.db";
 };
 
 zone "split-smart.example" {
-	type master;
+	type primary;
 	file "split-smart.example.db";
 };
 
 zone "nsec3chain-test" {
-	type slave;
+	type secondary;
 	file "nsec3chain-test.bk";
 	primaries { 10.53.0.2; };
 };
 
 zone "expiring.example" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "expiring.example.db.signed";
 };
 
 zone "nosign.example" {
-	type master;
+	type primary;
 	allow-update { any; };
 	dnssec-update-mode no-resign;
 	file "nosign.example.db.signed";
 };
 
 zone "upper.example" {
-	type master;
+	type primary;
 	file "upper.example.db.signed";
 };
 
 zone "LOWER.EXAMPLE" {
-	type master;
+	type primary;
 	file "lower.example.db.signed";
 };
 
 zone "inline.example" {
-	type master;
+	type primary;
 	file "inline.example.db";
 	inline-signing yes;
 	auto-dnssec maintain;
 };
 
 zone "publish-inactive.example" {
-	type master;
+	type primary;
 	file "publish-inactive.example.db";
 	auto-dnssec maintain;
 	update-policy local;
 };
 
 zone "future.example" {
-	type master;
+	type primary;
 	file "future.example.db.signed";
 };
 
 zone "managed-future.example" {
-	type master;
+	type primary;
 	file "managed-future.example.db.signed";
 	allow-update { any; };
 };
 
 zone "revkey.example" {
-	type master;
+	type primary;
 	file "revkey.example.db.signed";
 };
 
 zone "dname-at-apex-nsec3.example" {
-	type master;
+	type primary;
 	file "dname-at-apex-nsec3.example.db.signed";
 };
 
 zone "occluded.example" {
-	type master;
+	type primary;
 	file "occluded.example.db.signed";
 };
 
 zone "secure.managed" {
-	type master;
+	type primary;
 	file "secure.managed.db.signed";
 };
 
 zone "disabled.managed" {
-	type master;
+	type primary;
 	file "disabled.managed.db.signed";
 };
 
 zone "enabled.managed" {
-	type master;
+	type primary;
 	file "enabled.managed.db.signed";
 };
 
 zone "unsupported.managed" {
-	type master;
+	type primary;
 	file "unsupported.managed.db.signed";
 };
 
 zone "revoked.managed" {
-	type master;
+	type primary;
 	file "revoked.managed.db.signed";
 };
 
 zone "secure.trusted" {
-	type master;
+	type primary;
 	file "secure.trusted.db.signed";
 };
 
 zone "disabled.trusted" {
-	type master;
+	type primary;
 	file "disabled.trusted.db.signed";
 };
 
 zone "enabled.trusted" {
-	type master;
+	type primary;
 	file "enabled.trusted.db.signed";
 };
 
 zone "unsupported.trusted" {
-	type master;
+	type primary;
 	file "unsupported.trusted.db.signed";
 };
 
 zone "revoked.trusted" {
-	type master;
+	type primary;
 	file "revoked.trusted.db.signed";
 };
 
diff --git a/bin/tests/system/dnssec/ns3/siginterval1.conf b/bin/tests/system/dnssec/ns3/siginterval1.conf
index 397fa76b51..83753efd60 100644
--- a/bin/tests/system/dnssec/ns3/siginterval1.conf
+++ b/bin/tests/system/dnssec/ns3/siginterval1.conf
@@ -10,7 +10,7 @@
  */
 
 zone "siginterval.example" {
-	type master;
+	type primary;
 	allow-update { any; };
 	sig-validity-interval 1 23;
 	dnskey-sig-validity 90;
diff --git a/bin/tests/system/dnssec/ns3/siginterval2.conf b/bin/tests/system/dnssec/ns3/siginterval2.conf
index eeeddcc3f3..d2bd0d59c6 100644
--- a/bin/tests/system/dnssec/ns3/siginterval2.conf
+++ b/bin/tests/system/dnssec/ns3/siginterval2.conf
@@ -10,7 +10,7 @@
  */
 
 zone "siginterval.example" {
-	type master;
+	type primary;
 	allow-update { any; };
 	sig-validity-interval 35 28;
 	dnskey-sig-validity 90;
diff --git a/bin/tests/system/dnssec/ns4/named4.conf.in b/bin/tests/system/dnssec/ns4/named4.conf.in
index 22217f36c4..77590b30f3 100644
--- a/bin/tests/system/dnssec/ns4/named4.conf.in
+++ b/bin/tests/system/dnssec/ns4/named4.conf.in
@@ -64,12 +64,12 @@ view auth {
 	allow-recursion { none; };
 
 	zone secure.example {
-		type slave;
+		type secondary;
 		primaries { 10.53.0.3; };
 	};
 
 	zone insecure.secure.example {
-		type slave;
+		type secondary;
 		primaries { 10.53.0.2; };
 	};
 };
diff --git a/bin/tests/system/dnssec/ns5/named2.conf.in b/bin/tests/system/dnssec/ns5/named2.conf.in
index 8aa4e6929a..de10865599 100644
--- a/bin/tests/system/dnssec/ns5/named2.conf.in
+++ b/bin/tests/system/dnssec/ns5/named2.conf.in
@@ -35,7 +35,7 @@ view root {
 	match-destinations { 127.0.0.1; };
 
 	zone "." {
-		type master;
+		type primary;
 		file "root.db.signed";
 	};
 };
diff --git a/bin/tests/system/dnssec/ns6/named.conf.in b/bin/tests/system/dnssec/ns6/named.conf.in
index 29279c2f98..fa74b6043b 100644
--- a/bin/tests/system/dnssec/ns6/named.conf.in
+++ b/bin/tests/system/dnssec/ns6/named.conf.in
@@ -31,7 +31,7 @@ zone "." {
 };
 
 zone "optout-tld" {
-	type master;
+	type primary;
 	file "optout-tld.db.signed";
 };
 
diff --git a/bin/tests/system/dnssec/ns7/named.conf.in b/bin/tests/system/dnssec/ns7/named.conf.in
index dd4cfd9a3c..70d71f6eff 100644
--- a/bin/tests/system/dnssec/ns7/named.conf.in
+++ b/bin/tests/system/dnssec/ns7/named.conf.in
@@ -31,42 +31,42 @@ zone "." {
 };
 
 zone "nsec3.example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.3; };
 	file "nsec3.example.bk";
 };
 
 zone "optout.example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.3; };
 	file "optout.example.bk";
 };
 
 zone "nsec3-unknown.example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.3; };
 	file "nsec3-unknown.example.bk";
 };
 
 zone "optout-unknown.example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.3; };
 	file "optout-unknown.example.bk";
 };
 
 zone "multiple.example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.3; };
 	file "multiple.example.bk";
 };
 
 zone "nosoa.secure.example" {
-	type master;
+	type primary;
 	file "nosoa.secure.example.db";
 };
 
 zone "split-rrsig" {
-	type master;
+	type primary;
 	file "split-rrsig.db.signed";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/dnstap/ns1/named.conf.in b/bin/tests/system/dnstap/ns1/named.conf.in
index 025b694aac..4e58a855a4 100644
--- a/bin/tests/system/dnstap/ns1/named.conf.in
+++ b/bin/tests/system/dnstap/ns1/named.conf.in
@@ -40,6 +40,6 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/dnstap/ns2/named.conf.in b/bin/tests/system/dnstap/ns2/named.conf.in
index 3df15a680b..9ea4629182 100644
--- a/bin/tests/system/dnstap/ns2/named.conf.in
+++ b/bin/tests/system/dnstap/ns2/named.conf.in
@@ -45,7 +45,7 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/dscp/ns1/named.conf.in b/bin/tests/system/dscp/ns1/named.conf.in
index 39ca4eebfb..0a5245d7dd 100644
--- a/bin/tests/system/dscp/ns1/named.conf.in
+++ b/bin/tests/system/dscp/ns1/named.conf.in
@@ -24,6 +24,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/dscp/ns2/named.conf.in b/bin/tests/system/dscp/ns2/named.conf.in
index 0b4fa4b4ab..94a9e3244a 100644
--- a/bin/tests/system/dscp/ns2/named.conf.in
+++ b/bin/tests/system/dscp/ns2/named.conf.in
@@ -24,7 +24,7 @@ options {
 };
 
 zone "." {
-	type slave;
+	type secondary;
 	file "root.bk";
 	primaries { 10.53.0.1; };
 };
diff --git a/bin/tests/system/dscp/ns4/named.conf.in b/bin/tests/system/dscp/ns4/named.conf.in
index df13caa77b..63fd7691ec 100644
--- a/bin/tests/system/dscp/ns4/named.conf.in
+++ b/bin/tests/system/dscp/ns4/named.conf.in
@@ -24,6 +24,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/dscp/ns5/named.conf.in b/bin/tests/system/dscp/ns5/named.conf.in
index 88a7ac1b5a..9ffa0a1272 100644
--- a/bin/tests/system/dscp/ns5/named.conf.in
+++ b/bin/tests/system/dscp/ns5/named.conf.in
@@ -25,7 +25,7 @@ options {
 };
 
 zone "." {
-	type slave;
+	type secondary;
 	file "root.bk";
 	primaries { 10.53.0.4; };
 };
diff --git a/bin/tests/system/dscp/ns7/named.conf.in b/bin/tests/system/dscp/ns7/named.conf.in
index 36932a458c..a7c8bf2021 100644
--- a/bin/tests/system/dscp/ns7/named.conf.in
+++ b/bin/tests/system/dscp/ns7/named.conf.in
@@ -25,7 +25,7 @@ options {
 };
 
 zone "." {
-	type slave;
+	type secondary;
 	file "root.bk";
 	transfer-source 10.53.0.7 dscp 46;
 	notify-source 10.53.0.7 dscp 46;
diff --git a/bin/tests/system/dsdigest/ns1/named.conf.in b/bin/tests/system/dsdigest/ns1/named.conf.in
index 88a2547935..a68caf9d96 100644
--- a/bin/tests/system/dsdigest/ns1/named.conf.in
+++ b/bin/tests/system/dsdigest/ns1/named.conf.in
@@ -27,7 +27,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
 
diff --git a/bin/tests/system/dsdigest/ns2/named.conf.in b/bin/tests/system/dsdigest/ns2/named.conf.in
index 6510dd5e92..8485ad75ac 100644
--- a/bin/tests/system/dsdigest/ns2/named.conf.in
+++ b/bin/tests/system/dsdigest/ns2/named.conf.in
@@ -32,12 +32,12 @@ zone "." {
 };
 
 zone "good" {
-	type master;
+	type primary;
 	file "good.db.signed";
 };
 
 zone "bad" {
-	type master;
+	type primary;
 	file "bad.db.signed";
 };
 
diff --git a/bin/tests/system/dupsigs/ns1/named.conf.in b/bin/tests/system/dupsigs/ns1/named.conf.in
index 296ad0ecc1..23749bcc6e 100644
--- a/bin/tests/system/dupsigs/ns1/named.conf.in
+++ b/bin/tests/system/dupsigs/ns1/named.conf.in
@@ -19,7 +19,7 @@ options {
 };
 
 zone "signing.test" {
-	type master;
+	type primary;
 	masterfile-format text;
 	allow-update { any; };
 	file "signing.test.db";
diff --git a/bin/tests/system/ecdsa/ns1/named.conf.in b/bin/tests/system/ecdsa/ns1/named.conf.in
index 88a2547935..a68caf9d96 100644
--- a/bin/tests/system/ecdsa/ns1/named.conf.in
+++ b/bin/tests/system/ecdsa/ns1/named.conf.in
@@ -27,7 +27,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
 
diff --git a/bin/tests/system/eddsa/ns1/named.conf.in b/bin/tests/system/eddsa/ns1/named.conf.in
index 88a2547935..a68caf9d96 100644
--- a/bin/tests/system/eddsa/ns1/named.conf.in
+++ b/bin/tests/system/eddsa/ns1/named.conf.in
@@ -27,7 +27,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
 
diff --git a/bin/tests/system/ednscompliance/ns1/named.conf.in b/bin/tests/system/ednscompliance/ns1/named.conf.in
index b24ceaa28d..6a8604fd16 100644
--- a/bin/tests/system/ednscompliance/ns1/named.conf.in
+++ b/bin/tests/system/ednscompliance/ns1/named.conf.in
@@ -21,6 +21,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/emptyzones/ns1/named2.conf.in b/bin/tests/system/emptyzones/ns1/named2.conf.in
index ad4d681ff8..01f8708c2e 100644
--- a/bin/tests/system/emptyzones/ns1/named2.conf.in
+++ b/bin/tests/system/emptyzones/ns1/named2.conf.in
@@ -42,5 +42,5 @@ zone "." {
 };
 
 zone "1.10.in-addr.arpa" {
-	type master; file "empty.db";
+	type primary; file "empty.db";
 };
diff --git a/bin/tests/system/emptyzones/ns1/rfc1918.zones b/bin/tests/system/emptyzones/ns1/rfc1918.zones
index 465c14f197..d15513bb84 100644
--- a/bin/tests/system/emptyzones/ns1/rfc1918.zones
+++ b/bin/tests/system/emptyzones/ns1/rfc1918.zones
@@ -9,22 +9,22 @@
  * information regarding copyright ownership.
  */
 
-zone "10.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "16.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "17.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "18.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "19.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "20.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "21.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "22.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "23.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "24.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "25.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "26.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "27.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "28.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "29.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "30.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "31.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
-zone "168.192.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "10.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "16.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "17.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "18.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "19.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "20.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "21.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "22.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "23.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "24.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "25.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "26.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "27.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "28.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "29.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "30.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "31.172.IN-ADDR.ARPA" { type primary; file "empty.db"; };
+zone "168.192.IN-ADDR.ARPA" { type primary; file "empty.db"; };
 
diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.in b/bin/tests/system/fetchlimit/ns1/named.conf.in
index c434e8b06a..83243e8f48 100644
--- a/bin/tests/system/fetchlimit/ns1/named.conf.in
+++ b/bin/tests/system/fetchlimit/ns1/named.conf.in
@@ -23,11 +23,11 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "example.info." {
-	type master;
+	type primary;
 	file "example-info.db";
 };
diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.in b/bin/tests/system/fetchlimit/ns2/named.conf.in
index fc578624a7..2d42aac3a0 100644
--- a/bin/tests/system/fetchlimit/ns2/named.conf.in
+++ b/bin/tests/system/fetchlimit/ns2/named.conf.in
@@ -33,7 +33,7 @@ controls {
 
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/filter-aaaa/ns1/named1.conf.in b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
index 31ea7a5828..a72007d76e 100644
--- a/bin/tests/system/filter-aaaa/ns1/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
@@ -40,6 +40,6 @@ controls {
 };
 
 
-zone "." { type master; file "root.db"; };
-zone "signed" { type master; file "signed.db.signed"; };
-zone "unsigned" { type master; file "unsigned.db"; };
+zone "." { type primary; file "root.db"; };
+zone "signed" { type primary; file "signed.db.signed"; };
+zone "unsigned" { type primary; file "unsigned.db"; };
diff --git a/bin/tests/system/filter-aaaa/ns1/named2.conf.in b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
index 72e10c4fb0..fbc4b721d5 100644
--- a/bin/tests/system/filter-aaaa/ns1/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
@@ -37,6 +37,6 @@ controls {
 	inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
-zone "." { type master; file "root.db"; };
-zone "signed" { type master; file "signed.db.signed"; };
-zone "unsigned" { type master; file "unsigned.db"; };
+zone "." { type primary; file "root.db"; };
+zone "signed" { type primary; file "signed.db.signed"; };
+zone "unsigned" { type primary; file "unsigned.db"; };
diff --git a/bin/tests/system/filter-aaaa/ns4/named1.conf.in b/bin/tests/system/filter-aaaa/ns4/named1.conf.in
index 69b7ac47d2..44fcd7cdbc 100644
--- a/bin/tests/system/filter-aaaa/ns4/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns4/named1.conf.in
@@ -37,6 +37,6 @@ controls {
 	inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
-zone "." { type master; file "root.db"; };
-zone "signed" { type master; file "signed.db.signed"; };
-zone "unsigned" { type master; file "unsigned.db"; };
+zone "." { type primary; file "root.db"; };
+zone "signed" { type primary; file "signed.db.signed"; };
+zone "unsigned" { type primary; file "unsigned.db"; };
diff --git a/bin/tests/system/filter-aaaa/ns4/named2.conf.in b/bin/tests/system/filter-aaaa/ns4/named2.conf.in
index 68b43c4cee..93af1bae13 100644
--- a/bin/tests/system/filter-aaaa/ns4/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns4/named2.conf.in
@@ -37,6 +37,6 @@ controls {
 	inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
-zone "." { type master; file "root.db"; };
-zone "signed" { type master; file "signed.db.signed"; };
-zone "unsigned" { type master; file "unsigned.db"; };
+zone "." { type primary; file "root.db"; };
+zone "signed" { type primary; file "signed.db.signed"; };
+zone "unsigned" { type primary; file "unsigned.db"; };
diff --git a/bin/tests/system/formerr/ns1/named.conf.in b/bin/tests/system/formerr/ns1/named.conf.in
index b24ceaa28d..6a8604fd16 100644
--- a/bin/tests/system/formerr/ns1/named.conf.in
+++ b/bin/tests/system/formerr/ns1/named.conf.in
@@ -21,6 +21,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/forward/ns1/named.conf.in b/bin/tests/system/forward/ns1/named.conf.in
index 282e76bb64..ac854fd822 100644
--- a/bin/tests/system/forward/ns1/named.conf.in
+++ b/bin/tests/system/forward/ns1/named.conf.in
@@ -22,37 +22,37 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "example1." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "example2." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "example3." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "example4." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "example5." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "sld.tld" {
-	type master;
+	type primary;
 	file "sld.tld.db";
 };
 
diff --git a/bin/tests/system/forward/ns2/named.conf.in b/bin/tests/system/forward/ns2/named.conf.in
index 14ae9644c8..f7256abb14 100644
--- a/bin/tests/system/forward/ns2/named.conf.in
+++ b/bin/tests/system/forward/ns2/named.conf.in
@@ -27,41 +27,41 @@ zone "." {
 };
 
 zone "example1." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "example2." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "example3." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "example4." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "example7." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "grafted." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "1.0.10.in-addr.arpa." {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "tld" {
-	type master;
+	type primary;
 	file "tld.db";
 };
diff --git a/bin/tests/system/forward/ns4/named.conf.in b/bin/tests/system/forward/ns4/named.conf.in
index fee76b41e5..855b4bfb82 100644
--- a/bin/tests/system/forward/ns4/named.conf.in
+++ b/bin/tests/system/forward/ns4/named.conf.in
@@ -57,6 +57,6 @@ zone "grafted" {
 };
 
 zone "malicious." {
-	type master;
+	type primary;
 	file "malicious.db";
 };
diff --git a/bin/tests/system/forward/ns5/named.conf.in b/bin/tests/system/forward/ns5/named.conf.in
index 6742222d4d..84f0ad089e 100644
--- a/bin/tests/system/forward/ns5/named.conf.in
+++ b/bin/tests/system/forward/ns5/named.conf.in
@@ -29,6 +29,6 @@ zone "." {
 };
 
 zone "rebind" {
-	type master;
+	type primary;
 	file "rebind.db";
 };
diff --git a/bin/tests/system/genzone.sh b/bin/tests/system/genzone.sh
index b7e1072ab3..cd4ac91371 100644
--- a/bin/tests/system/genzone.sh
+++ b/bin/tests/system/genzone.sh
@@ -12,10 +12,10 @@
 #
 # Set up a test zone
 #
-# Usage: genzone.sh master-server-number slave-server-number...
+# Usage: genzone.sh master-server-number secondary-server-number...
 #
 # e.g., "genzone.sh 2 3 4" means ns2 is the master and ns3, ns4
-# are slaves.
+# are secondaries.
 #
 
 master="$1"
diff --git a/bin/tests/system/geoip2/conf/bad-dbname.conf b/bin/tests/system/geoip2/conf/bad-dbname.conf
index 31268b0500..10e6237190 100644
--- a/bin/tests/system/geoip2/conf/bad-dbname.conf
+++ b/bin/tests/system/geoip2/conf/bad-dbname.conf
@@ -22,7 +22,7 @@ options {
 view one {
 	match-clients { geoip db unknown asnum "WX"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
diff --git a/bin/tests/system/geoip2/conf/bad-regiondb.conf b/bin/tests/system/geoip2/conf/bad-regiondb.conf
index 38b68b029c..4f55d3314e 100644
--- a/bin/tests/system/geoip2/conf/bad-regiondb.conf
+++ b/bin/tests/system/geoip2/conf/bad-regiondb.conf
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip db region region "California"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
diff --git a/bin/tests/system/geoip2/conf/bad-threeletter.conf b/bin/tests/system/geoip2/conf/bad-threeletter.conf
index 06d8b888e4..bd0f200809 100644
--- a/bin/tests/system/geoip2/conf/bad-threeletter.conf
+++ b/bin/tests/system/geoip2/conf/bad-threeletter.conf
@@ -27,7 +27,7 @@ options {
 view one {
 	match-clients { geoip db country country AUS; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named1.conf.in b/bin/tests/system/geoip2/ns2/named1.conf.in
index 7d8ceb1d11..2838b28fce 100644
--- a/bin/tests/system/geoip2/ns2/named1.conf.in
+++ b/bin/tests/system/geoip2/ns2/named1.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip db country country AU; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view two {
 	match-clients { geoip db country country US; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -52,7 +52,7 @@ view two {
 view three {
 	match-clients { geoip db country country GB; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -60,7 +60,7 @@ view three {
 view four {
 	match-clients { geoip db country country CA; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -68,7 +68,7 @@ view four {
 view five {
 	match-clients { geoip db country country CL; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -76,7 +76,7 @@ view five {
 view six {
 	match-clients { geoip db country country DE; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -84,7 +84,7 @@ view six {
 view seven {
 	match-clients { geoip db country country EH; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -92,7 +92,7 @@ view seven {
 view other {
 	match-clients { geoip db country country O1; };
 	zone "example" {
-		type master;
+		type primary;
 		file "exampleother.db";
 	};
 };
@@ -100,7 +100,7 @@ view other {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named10.conf.in b/bin/tests/system/geoip2/ns2/named10.conf.in
index 9e12fe084c..f809d04d99 100644
--- a/bin/tests/system/geoip2/ns2/named10.conf.in
+++ b/bin/tests/system/geoip2/ns2/named10.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip asnum 100001; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view two {
 	match-clients { geoip asnum 100002; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -52,7 +52,7 @@ view two {
 view three {
 	match-clients { geoip asnum 100003; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -60,7 +60,7 @@ view three {
 view four {
 	match-clients { geoip asnum 100004; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -68,7 +68,7 @@ view four {
 view five {
 	match-clients { geoip asnum 100005; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -76,7 +76,7 @@ view five {
 view six {
 	match-clients { geoip asnum 100006; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -84,7 +84,7 @@ view six {
 view seven {
 	match-clients { geoip asnum 100007; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -92,7 +92,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named11.conf.in b/bin/tests/system/geoip2/ns2/named11.conf.in
index 4ad1ad0bda..0a4892599c 100644
--- a/bin/tests/system/geoip2/ns2/named11.conf.in
+++ b/bin/tests/system/geoip2/ns2/named11.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip domain one.de; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view two {
 	match-clients { geoip domain two.com; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -52,7 +52,7 @@ view two {
 view three {
 	match-clients { geoip domain three.com; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -60,7 +60,7 @@ view three {
 view four {
 	match-clients { geoip domain four.edu; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -68,7 +68,7 @@ view four {
 view five {
 	match-clients { geoip domain five.es; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -76,7 +76,7 @@ view five {
 view six {
 	match-clients { geoip domain six.it; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -84,7 +84,7 @@ view six {
 view seven {
 	match-clients { geoip domain seven.org; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -92,7 +92,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named2.conf.in b/bin/tests/system/geoip2/ns2/named2.conf.in
index b0c1564079..8794cbbd95 100644
--- a/bin/tests/system/geoip2/ns2/named2.conf.in
+++ b/bin/tests/system/geoip2/ns2/named2.conf.in
@@ -44,7 +44,7 @@ acl gEH { geoip db country country EH; };
 view one {
 	match-clients { gAU; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -52,7 +52,7 @@ view one {
 view two {
 	match-clients { gUS; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -60,7 +60,7 @@ view two {
 view three {
 	match-clients { gGB; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -68,7 +68,7 @@ view three {
 view four {
 	match-clients { gCA; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -76,7 +76,7 @@ view four {
 view five {
 	match-clients { gCL; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -84,7 +84,7 @@ view five {
 view six {
 	match-clients { gDE; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -92,7 +92,7 @@ view six {
 view seven {
 	match-clients { gEH; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -100,7 +100,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "examplebogus.db";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named3.conf.in b/bin/tests/system/geoip2/ns2/named3.conf.in
index e275fe3424..ecd758c1a6 100644
--- a/bin/tests/system/geoip2/ns2/named3.conf.in
+++ b/bin/tests/system/geoip2/ns2/named3.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip db country country Australia; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view two {
 	match-clients { geoip db country country "United States"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -52,7 +52,7 @@ view two {
 view three {
 	match-clients { geoip db country country "United Kingdom"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -60,7 +60,7 @@ view three {
 view four {
 	match-clients { geoip db country country Canada; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -68,7 +68,7 @@ view four {
 view five {
 	match-clients { geoip db country country Chile; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -76,7 +76,7 @@ view five {
 view six {
 	match-clients { geoip db country country Germany; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -84,7 +84,7 @@ view six {
 view seven {
 	match-clients { geoip db country country "Western Sahara"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -92,7 +92,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named4.conf.in b/bin/tests/system/geoip2/ns2/named4.conf.in
index a3015d64f3..e5c88284fd 100644
--- a/bin/tests/system/geoip2/ns2/named4.conf.in
+++ b/bin/tests/system/geoip2/ns2/named4.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip db country continent OC; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view two {
 	match-clients { geoip db country continent NA; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -52,7 +52,7 @@ view two {
 view three {
 	match-clients { geoip db country continent EU; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -60,7 +60,7 @@ view three {
 view five {
 	match-clients { geoip db country continent SA; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -68,7 +68,7 @@ view five {
 view seven {
 	match-clients { geoip db country continent AF; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -76,7 +76,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named5.conf.in b/bin/tests/system/geoip2/ns2/named5.conf.in
index c38e613d2f..0b53520018 100644
--- a/bin/tests/system/geoip2/ns2/named5.conf.in
+++ b/bin/tests/system/geoip2/ns2/named5.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip region CA; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view three {
 	match-clients { geoip region OK; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -52,7 +52,7 @@ view three {
 view four {
 	match-clients { geoip region VA; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -60,7 +60,7 @@ view four {
 view five {
 	match-clients { geoip region GA; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -68,7 +68,7 @@ view five {
 view six {
 	match-clients { geoip region CO; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -76,7 +76,7 @@ view six {
 view seven {
 	match-clients { geoip region AK; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -84,7 +84,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named6.conf.in b/bin/tests/system/geoip2/ns2/named6.conf.in
index 3e95e70090..56e17b3820 100644
--- a/bin/tests/system/geoip2/ns2/named6.conf.in
+++ b/bin/tests/system/geoip2/ns2/named6.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip city "Redwood City"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view two {
 	match-clients { geoip city "Santa Cruz"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -52,7 +52,7 @@ view two {
 view three {
 	match-clients { geoip city "Oklahoma City"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -60,7 +60,7 @@ view three {
 view four {
 	match-clients { geoip city "Ashland"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -68,7 +68,7 @@ view four {
 view five {
 	match-clients { geoip city "Atlanta"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -76,7 +76,7 @@ view five {
 view six {
 	match-clients { geoip city "Morrison"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -84,7 +84,7 @@ view six {
 view seven {
 	match-clients { geoip city "Ketchikan"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -92,7 +92,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named7.conf.in b/bin/tests/system/geoip2/ns2/named7.conf.in
index 0674e75fbf..93e6a2c712 100644
--- a/bin/tests/system/geoip2/ns2/named7.conf.in
+++ b/bin/tests/system/geoip2/ns2/named7.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip isp "One Systems, Inc."; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view two {
 	match-clients { geoip isp "Two Technology Ltd."; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -52,7 +52,7 @@ view two {
 view three {
 	match-clients { geoip isp "Three Network Labs"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -60,7 +60,7 @@ view three {
 view four {
 	match-clients { geoip isp "Four University"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -68,7 +68,7 @@ view four {
 view five {
 	match-clients { geoip isp "Five Telecom"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -76,7 +76,7 @@ view five {
 view six {
 	match-clients { geoip isp "Six Company"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -84,7 +84,7 @@ view six {
 view seven {
 	match-clients { geoip isp "Seven Communications"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -92,7 +92,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named8.conf.in b/bin/tests/system/geoip2/ns2/named8.conf.in
index a175cb9d25..ebf17659d6 100644
--- a/bin/tests/system/geoip2/ns2/named8.conf.in
+++ b/bin/tests/system/geoip2/ns2/named8.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip org "One Systems, Inc."; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view two {
 	match-clients { geoip org "Two Technology Ltd."; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -52,7 +52,7 @@ view two {
 view three {
 	match-clients { geoip org "Three Network Labs"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -60,7 +60,7 @@ view three {
 view four {
 	match-clients { geoip org "Four University"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -68,7 +68,7 @@ view four {
 view five {
 	match-clients { geoip org "Five Telecom"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -76,7 +76,7 @@ view five {
 view six {
 	match-clients { geoip org "Six Company"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -84,7 +84,7 @@ view six {
 view seven {
 	match-clients { geoip org "Seven Communications"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -92,7 +92,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/geoip2/ns2/named9.conf.in b/bin/tests/system/geoip2/ns2/named9.conf.in
index 41992e49bf..a9161c0f75 100644
--- a/bin/tests/system/geoip2/ns2/named9.conf.in
+++ b/bin/tests/system/geoip2/ns2/named9.conf.in
@@ -36,7 +36,7 @@ controls {
 view one {
 	match-clients { geoip asnum "AS100001"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -44,7 +44,7 @@ view one {
 view two {
 	match-clients { geoip asnum "AS100002"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
@@ -52,7 +52,7 @@ view two {
 view three {
 	match-clients { geoip asnum "AS100003"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example3.db";
 	};
 };
@@ -60,7 +60,7 @@ view three {
 view four {
 	match-clients { geoip asnum "AS100004"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example4.db";
 	};
 };
@@ -68,7 +68,7 @@ view four {
 view five {
 	match-clients { geoip asnum "AS100005"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example5.db";
 	};
 };
@@ -76,7 +76,7 @@ view five {
 view six {
 	match-clients { geoip asnum "AS100006"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example6.db";
 	};
 };
@@ -84,7 +84,7 @@ view six {
 view seven {
 	match-clients { geoip asnum "AS100007"; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example7.db";
 	};
 };
@@ -92,7 +92,7 @@ view seven {
 view none {
 	match-clients { any; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db.in";
 	};
 };
diff --git a/bin/tests/system/glue/ns1/named.conf.in b/bin/tests/system/glue/ns1/named.conf.in
index 5f8e2fcfe6..d036060f40 100644
--- a/bin/tests/system/glue/ns1/named.conf.in
+++ b/bin/tests/system/glue/ns1/named.conf.in
@@ -22,15 +22,15 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "root-servers.nil" {
-	type master;
+	type primary;
 	file "root-servers.nil.db";
 };
 zone "net" {
-	type master;
+	type primary;
 	file "net.db";
 };
diff --git a/bin/tests/system/idna/ns1/named.conf.in b/bin/tests/system/idna/ns1/named.conf.in
index 066e453d76..ff1317892e 100644
--- a/bin/tests/system/idna/ns1/named.conf.in
+++ b/bin/tests/system/idna/ns1/named.conf.in
@@ -23,6 +23,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/include-multiplecfg/ns2/mars.conf b/bin/tests/system/include-multiplecfg/ns2/mars.conf
index b7af878444..9ebeb54bed 100644
--- a/bin/tests/system/include-multiplecfg/ns2/mars.conf
+++ b/bin/tests/system/include-multiplecfg/ns2/mars.conf
@@ -1,6 +1,6 @@
 
 zone "mars.com" {
-        type master;
+        type primary;
         file "mars.com.db";
 };
 
diff --git a/bin/tests/system/include-multiplecfg/ns2/zone1.conf b/bin/tests/system/include-multiplecfg/ns2/zone1.conf
index 8dcae426cf..168fff43ec 100644
--- a/bin/tests/system/include-multiplecfg/ns2/zone1.conf
+++ b/bin/tests/system/include-multiplecfg/ns2/zone1.conf
@@ -1,6 +1,6 @@
 
 zone "zone1.com" {
-        type master;
+        type primary;
         file "zone1.com.db";
 };
 
diff --git a/bin/tests/system/include-multiplecfg/ns2/zone2.conf b/bin/tests/system/include-multiplecfg/ns2/zone2.conf
index bb995b64f0..6b2b0bd6c3 100644
--- a/bin/tests/system/include-multiplecfg/ns2/zone2.conf
+++ b/bin/tests/system/include-multiplecfg/ns2/zone2.conf
@@ -1,6 +1,6 @@
 
 zone "zone2.com" {
-        type master;
+        type primary;
         file "zone2.com.db";
 };
 
diff --git a/bin/tests/system/inline/ns1/named.conf.in b/bin/tests/system/inline/ns1/named.conf.in
index 88a2547935..a68caf9d96 100644
--- a/bin/tests/system/inline/ns1/named.conf.in
+++ b/bin/tests/system/inline/ns1/named.conf.in
@@ -27,7 +27,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
 
diff --git a/bin/tests/system/inline/ns2/named.conf.in b/bin/tests/system/inline/ns2/named.conf.in
index c4da5080cf..3b1aa65edf 100644
--- a/bin/tests/system/inline/ns2/named.conf.in
+++ b/bin/tests/system/inline/ns2/named.conf.in
@@ -32,20 +32,20 @@ options {
 };
 
 zone "bits" {
-	type master;
+	type primary;
 	file "bits.db";
 	allow-update { any; };
 };
 
 zone "retransfer" {
-	type master;
+	type primary;
 	file "retransfer.db";
 	allow-update { any; };
 	notify no;
 };
 
 zone "retransfer3" {
-	type master;
+	type primary;
 	file "retransfer3.db";
 	allow-update { any; };
 	allow-transfer { none; };	// changed dynamically by tests.sh
@@ -53,31 +53,31 @@ zone "retransfer3" {
 };
 
 zone "nsec3-loop" {
-	type master;
+	type primary;
 	file "nsec3-loop.db";
 	notify no;
 };
 
 zone "inactiveksk" {
-	type master;
+	type primary;
 	file "inactiveksk.db";
 	allow-update { any; };
 };
 
 zone "inactivezsk" {
-	type master;
+	type primary;
 	file "inactivezsk.db";
 	allow-update { any; };
 };
 
 zone "nokeys" {
-	type master;
+	type primary;
 	file "nokeys.db";
 	allow-update { any; };
 };
 
 zone "removedkeys-secondary" {
-	type master;
+	type primary;
 	file "removedkeys-secondary.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/inline/ns3/named.conf.in b/bin/tests/system/inline/ns3/named.conf.in
index c5f467f444..8ccfaf7d2f 100644
--- a/bin/tests/system/inline/ns3/named.conf.in
+++ b/bin/tests/system/inline/ns3/named.conf.in
@@ -33,7 +33,7 @@ options {
 };
 
 zone "bits" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	inline-signing yes;
 	auto-dnssec maintain;
@@ -45,7 +45,7 @@ zone "bits" {
 server 10.53.0.4 { request-ixfr no; };
 
 zone "noixfr" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.4; };
 	inline-signing yes;
 	auto-dnssec maintain;
@@ -54,7 +54,7 @@ zone "noixfr" {
 };
 
 zone "master" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "master.db";
@@ -65,7 +65,7 @@ zone "master" {
 };
 
 zone "dynamic" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	allow-update { any; };
@@ -73,7 +73,7 @@ zone "dynamic" {
 };
 
 zone "updated" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	allow-update { none; };
@@ -81,7 +81,7 @@ zone "updated" {
 };
 
 zone "expired" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	allow-update { any; };
@@ -89,7 +89,7 @@ zone "expired" {
 };
 
 zone "retransfer" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	inline-signing yes;
 	auto-dnssec maintain;
@@ -97,7 +97,7 @@ zone "retransfer" {
 };
 
 zone "nsec3" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	allow-update { any; };
@@ -105,7 +105,7 @@ zone "nsec3" {
 };
 
 zone "externalkey" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	allow-update { any; };
@@ -113,7 +113,7 @@ zone "externalkey" {
 };
 
 zone "retransfer3" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	inline-signing yes;
 	auto-dnssec maintain;
@@ -121,7 +121,7 @@ zone "retransfer3" {
 };
 
 zone "inactiveksk" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	inline-signing yes;
 	auto-dnssec maintain;
@@ -130,7 +130,7 @@ zone "inactiveksk" {
 };
 
 zone "inactivezsk" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	inline-signing yes;
 	auto-dnssec maintain;
@@ -138,7 +138,7 @@ zone "inactivezsk" {
 };
 
 zone "nokeys" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	inline-signing yes;
 	auto-dnssec maintain;
@@ -146,14 +146,14 @@ zone "nokeys" {
 };
 
 zone "delayedkeys" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "delayedkeys.db";
 };
 
 zone "removedkeys-primary" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	allow-update { any; };
@@ -162,7 +162,7 @@ zone "removedkeys-primary" {
 };
 
 zone "removedkeys-secondary" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	inline-signing yes;
 	auto-dnssec maintain;
@@ -170,7 +170,7 @@ zone "removedkeys-secondary" {
 };
 
 zone "unsupported" {
-	type master;
+	type primary;
 	file "unsupported.db";
 	inline-signing yes;
 	auto-dnssec maintain;
diff --git a/bin/tests/system/inline/ns4/named.conf.in b/bin/tests/system/inline/ns4/named.conf.in
index c20c74e6cb..ef13b57ea1 100644
--- a/bin/tests/system/inline/ns4/named.conf.in
+++ b/bin/tests/system/inline/ns4/named.conf.in
@@ -25,7 +25,7 @@ options {
 };
 
 zone "noixfr" {
-	type master;
+	type primary;
 	file "noixfr.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/inline/ns5/named.conf.post b/bin/tests/system/inline/ns5/named.conf.post
index 2a241e57c2..f02dc5c34a 100644
--- a/bin/tests/system/inline/ns5/named.conf.post
+++ b/bin/tests/system/inline/ns5/named.conf.post
@@ -32,8 +32,8 @@ options {
 };
 
 zone "bits" {
-	type slave;
-	masters { 10.53.0.2; };
+	type secondary;
+	primaries { 10.53.0.2; };
 	file "bits.bk";
 	auto-dnssec maintain;
 	inline-signing yes;
diff --git a/bin/tests/system/inline/ns5/named.conf.pre b/bin/tests/system/inline/ns5/named.conf.pre
index dd92ebe32f..be812e4e51 100644
--- a/bin/tests/system/inline/ns5/named.conf.pre
+++ b/bin/tests/system/inline/ns5/named.conf.pre
@@ -31,7 +31,7 @@ options {
 };
 
 zone "bits" {
-	type slave;
-	masters { 10.53.0.2; };
+	type secondary;
+	primaries { 10.53.0.2; };
 	file "bits.bk";
 };
diff --git a/bin/tests/system/inline/ns8/named.conf.in b/bin/tests/system/inline/ns8/named.conf.in
index ea4876bcf4..8663ee867b 100644
--- a/bin/tests/system/inline/ns8/named.conf.in
+++ b/bin/tests/system/inline/ns8/named.conf.in
@@ -34,112 +34,112 @@ options {
 };
 
 zone "example01.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example01.com.db";
 };
 
 zone "example02.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example02.com.db";
 };
 
 zone "example03.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example03.com.db";
 };
 
 zone "example04.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example04.com.db";
 };
 
 zone "example05.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example05.com.db";
 };
 
 zone "example06.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example06.com.db";
 };
 
 zone "example07.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example07.com.db";
 };
 
 zone "example08.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example08.com.db";
 };
 
 zone "example09.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example09.com.db";
 };
 
 zone "example10.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example10.com.db";
 };
 
 zone "example11.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example11.com.db";
 };
 
 zone "example12.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example12.com.db";
 };
 
 zone "example13.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example13.com.db";
 };
 
 zone "example14.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example14.com.db";
 };
 
 zone "example15.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example15.com.db";
 };
 
 zone "example16.com" {
-	type master;
+	type primary;
 	inline-signing yes;
 	auto-dnssec maintain;
 	file "example16.com.db";
diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh
index a53430d5e9..9cfcb2ba0b 100755
--- a/bin/tests/system/inline/tests.sh
+++ b/bin/tests/system/inline/tests.sh
@@ -142,7 +142,7 @@ send
 EOF
 
 n=`expr $n + 1`
-echo_i "checking that the record is added on the hidden master ($n)"
+echo_i "checking that the record is added on the hidden primary ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.2 added.bits A > dig.out.ns2.test$n
 grep "status: NOERROR" dig.out.ns2.test$n > /dev/null || ret=1
@@ -173,7 +173,7 @@ send
 EOF
 
 n=`expr $n + 1`
-echo_i "checking YYYYMMDDVV (2011072400) serial on hidden master ($n)"
+echo_i "checking YYYYMMDDVV (2011072400) serial on hidden primary ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.2 bits SOA > dig.out.ns2.test$n
 grep "status: NOERROR" dig.out.ns2.test$n > /dev/null || ret=1
@@ -220,7 +220,7 @@ send
 EOF
 
 n=`expr $n + 1`
-echo_i "checking that the record is added on the hidden master, noixfr ($n)"
+echo_i "checking that the record is added on the hidden primary, noixfr ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.4 added.noixfr A > dig.out.ns4.test$n
 grep "status: NOERROR" dig.out.ns4.test$n > /dev/null || ret=1
@@ -251,7 +251,7 @@ send
 EOF
 
 n=`expr $n + 1`
-echo_i "checking YYYYMMDDVV (2011072400) serial on hidden master, noixfr ($n)"
+echo_i "checking YYYYMMDDVV (2011072400) serial on hidden primary, noixfr ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.4 noixfr SOA > dig.out.ns4.test$n
 grep "status: NOERROR" dig.out.ns4.test$n > /dev/null || ret=1
@@ -276,7 +276,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking that the master zone signed on initial load ($n)"
+echo_i "checking that the primary zone signed on initial load ($n)"
 ret=0
 for i in 1 2 3 4 5 6 7 8 9 10
 do
@@ -291,7 +291,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking removal of private type record via 'rndc signing -clear' (master) ($n)"
+echo_i "checking removal of private type record via 'rndc signing -clear' (primary) ($n)"
 ret=0
 $RNDCCMD 10.53.0.3 signing -list master > signing.out.test$n 2>&1
 keys=`sed -n -e 's/Done signing with key \(.*\)$/\1/p' signing.out.test$n`
@@ -314,7 +314,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking private type was properly signed (master) ($n)"
+echo_i "checking private type was properly signed (primary) ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.6 master TYPE65534 > dig.out.ns6.test$n
 grep "ANSWER: 2," dig.out.ns6.test$n > /dev/null || ret=1
@@ -324,7 +324,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking removal of remaining private type record via 'rndc signing -clear' (master) ($n)"
+echo_i "checking removal of remaining private type record via 'rndc signing -clear' (primary) ($n)"
 ret=0
 $RNDCCMD 10.53.0.3 signing -clear all master > /dev/null || ret=1
 for i in 1 2 3 4 5 6 7 8 9 10
@@ -341,7 +341,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "check adding of record to unsigned master ($n)"
+echo_i "check adding of record to unsigned primary ($n)"
 ret=0
 cp ns3/master2.db.in ns3/master.db
 rndc_reload ns3 10.53.0.3 master
@@ -398,7 +398,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking that the dynamic master zone signed on initial load ($n)"
+echo_i "checking that the dynamic primary zone signed on initial load ($n)"
 ret=0
 for i in 1 2 3 4 5 6 7 8 9 10
 do
@@ -413,7 +413,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking master zone that was updated while offline is correct ($n)"
+echo_i "checking primary zone that was updated while offline is correct ($n)"
 ret=0
 $DIG $DIGOPTS +nodnssec +short @10.53.0.3 updated SOA >dig.out.ns2.soa.test$n
 serial=`awk '{print $3}' dig.out.ns2.soa.test$n`
@@ -436,7 +436,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking adding of record to unsigned master using UPDATE ($n)"
+echo_i "checking adding of record to unsigned primary using UPDATE ($n)"
 ret=0
 
 [ -f ns3/dynamic.db.jnl ] && { ret=1 ; echo_i "journal exists (pretest)" ; }
@@ -487,7 +487,7 @@ send
 EOF
 
 n=`expr $n + 1`
-echo_i "checking YYYYMMDDVV (2011072450) serial on hidden master ($n)"
+echo_i "checking YYYYMMDDVV (2011072450) serial on hidden primary ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.2 bits SOA > dig.out.ns2.test$n
 grep "status: NOERROR" dig.out.ns2.test$n > /dev/null || ret=1
@@ -519,7 +519,7 @@ send
 EOF
 
 n=`expr $n + 1`
-echo_i "checking YYYYMMDDVV (2011072450) serial on hidden master, noixfr ($n)"
+echo_i "checking YYYYMMDDVV (2011072450) serial on hidden primary, noixfr ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.4 noixfr SOA > dig.out.ns4.test$n
 grep "status: NOERROR" dig.out.ns4.test$n > /dev/null || ret=1
@@ -551,7 +551,7 @@ send
 EOF
 
 n=`expr $n + 1`
-echo_i "checking forwarded update on hidden master ($n)"
+echo_i "checking forwarded update on hidden primary ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.2 bits SOA > dig.out.ns2.test$n
 grep "status: NOERROR" dig.out.ns2.test$n > /dev/null || ret=1
@@ -583,7 +583,7 @@ send
 EOF
 
 n=`expr $n + 1`
-echo_i "checking forwarded update on hidden master, noixfr ($n)"
+echo_i "checking forwarded update on hidden primary, noixfr ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.4 noixfr SOA > dig.out.ns4.test$n
 grep "status: NOERROR" dig.out.ns4.test$n > /dev/null || ret=1
@@ -609,7 +609,7 @@ status=`expr $status + $ret`
 
 ret=0
 n=`expr $n + 1`
-echo_i "checking turning on of inline signing in a slave zone via reload ($n)"
+echo_i "checking turning on of inline signing in a secondary zone via reload ($n)"
 $DIG $DIGOPTS @10.53.0.5 +dnssec bits SOA > dig.out.ns5.test$n
 grep "status: NOERROR" dig.out.ns5.test$n > /dev/null || ret=1
 grep "ANSWER: 1," dig.out.ns5.test$n > /dev/null || ret=1
@@ -728,7 +728,7 @@ send
 EOF
 
 n=`expr $n + 1`
-echo_i "checking that the retransfer record is added on the hidden master ($n)"
+echo_i "checking that the retransfer record is added on the hidden primary ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.2 added.retransfer A > dig.out.ns2.test$n
 grep "status: NOERROR" dig.out.ns2.test$n > /dev/null || ret=1
@@ -751,7 +751,7 @@ if [ $ans != 1 ]; then echo_i "failed"; ret=1; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "check rndc retransfer of a inline slave zone works ($n)"
+echo_i "check rndc retransfer of a inline secondary zone works ($n)"
 ret=0
 $RNDCCMD 10.53.0.3 retransfer retransfer 2>&1 || ret=1
 for i in 0 1 2 3 4 5 6 7 8 9
@@ -806,7 +806,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "check rndc retransfer of a inline nsec3 slave retains nsec3 ($n)"
+echo_i "check rndc retransfer of a inline nsec3 secondary retains nsec3 ($n)"
 ret=0
 $RNDCCMD 10.53.0.3 signing -nsec3param 1 0 0 - retransfer3 > /dev/null 2>&1 || ret=1
 for i in 0 1 2 3 4 5 6 7 8 9
@@ -835,13 +835,13 @@ status=`expr $status + $ret`
 # NOTE: The test below should be considered fragile.  More details can be found
 # in the comment inside ns7/named.conf.
 n=`expr $n + 1`
-echo_i "check rndc retransfer of a inline nsec3 slave does not trigger an infinite loop ($n)"
+echo_i "check rndc retransfer of a inline nsec3 secondary does not trigger an infinite loop ($n)"
 ret=0
 zone=nsec3-loop
-# Add slave zone using rndc
+# Add secondary zone using rndc
 $RNDCCMD 10.53.0.7 addzone $zone \
-	'{ type slave; masters { 10.53.0.2; }; file "'$zone'.db"; inline-signing yes; auto-dnssec maintain; };'
-# Wait until slave zone is fully signed using NSEC
+	'{ type secondary; primaries { 10.53.0.2; }; file "'$zone'.db"; inline-signing yes; auto-dnssec maintain; };'
+# Wait until secondary zone is fully signed using NSEC
 for i in 1 2 3 4 5 6 7 8 9 0
 do
 	ret=1
@@ -850,9 +850,9 @@ do
 	[ $keys -eq 3 ] && ret=0 && break
 	sleep 1
 done
-# Switch slave zone to NSEC3
+# Switch secondary zone to NSEC3
 $RNDCCMD 10.53.0.7 signing -nsec3param 1 0 2 12345678 $zone > /dev/null 2>&1
-# Wait until slave zone is fully signed using NSEC3
+# Wait until secondary zone is fully signed using NSEC3
 for i in 1 2 3 4 5 6 7 8 9 0
 do
 	ret=1
@@ -860,7 +860,7 @@ do
 	test "$nsec3param" = "1 0 2 12345678" && ret=0 && break
 	sleep 1
 done
-# Attempt to retransfer the slave zone from master
+# Attempt to retransfer the secondary zone from primary
 $RNDCCMD 10.53.0.7 retransfer $zone
 # Check whether the signer managed to fully sign the retransferred zone by
 # waiting for a specific SOA serial number to appear in the logs; if this
@@ -917,7 +917,7 @@ n=`expr $n + 1`
 echo_i "check that reloading all zones does not cause zone maintenance to cease for inline-signed zones ($n)"
 ret=1
 # Ensure "rndc reload" attempts to load ns3/master.db by waiting 1 second so
-# that the master file modification time has no possibility of being equal to
+# that the file modification time has no possibility of being equal to
 # the one stored during server startup.
 sleep 1
 nextpart ns3/named.run > /dev/null
@@ -931,7 +931,7 @@ do
 	fi
 	sleep 1
 done
-# Sanity check: master file updates should be reflected in the signed zone,
+# Sanity check: file updates should be reflected in the signed zone,
 # i.e. SOA RNAME should no longer be set to "hostmaster".
 $DIG $DIGOPTS @10.53.0.3 master SOA > dig.out.ns3.test$n || ret=1
 grep "hostmaster" dig.out.ns3.test$n > /dev/null && ret=1
@@ -967,11 +967,11 @@ ret=0
 for zone in a b c d e f g h i j k l m n o p q r s t u v w x y z
 do
 $RNDCCMD 10.53.0.2 addzone test-$zone \
-	'{ type master; file "bits.db.in"; allow-transfer { any; }; };'
+	'{ type primary; file "bits.db.in"; allow-transfer { any; }; };'
 $DIG $DIGOPTS @10.53.0.2 test-$zone SOA > dig.out.ns2.$zone.test$n
 grep "status: NOERROR," dig.out.ns2.$zone.test$n  > /dev/null || { ret=1; cat dig.out.ns2.$zone.test$n; }
 $RNDCCMD 10.53.0.3 addzone test-$zone \
-	'{ type slave; masters { 10.53.0.2; }; file "'test-$zone.bk'"; inline-signing yes; auto-dnssec maintain; allow-transfer { any; }; };'
+	'{ type secondary; primaries { 10.53.0.2; }; file "'test-$zone.bk'"; inline-signing yes; auto-dnssec maintain; allow-transfer { any; }; };'
 $RNDCCMD 10.53.0.3 delzone test-$zone > /dev/null 2>&1
 done
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -1183,7 +1183,7 @@ grep "RRSIG" dig.out.ns3.pre.test$n > /dev/null && ret=1
 # Ensure the wait_until_raw_zone_update_is_processed() call below will ignore
 # log messages generated before the raw zone is updated.
 nextpart ns3/named.run > /dev/null
-# Add a record to the raw zone on the master.
+# Add a record to the raw zone on the primary.
 $NSUPDATE << EOF || ret=1
 zone nokeys.
 server 10.53.0.2 ${PORT}
@@ -1212,7 +1212,7 @@ mv -f ns3/Kremovedkeys-primary* ns3/removedkeys
 # Ensure the wait_until_raw_zone_update_is_processed() call below will ignore
 # log messages generated before the raw zone is updated.
 nextpart ns3/named.run > /dev/null
-# Add a record to the raw zone on the master.
+# Add a record to the raw zone on the primary.
 $NSUPDATE << EOF || ret=1
 zone removedkeys-primary.
 server 10.53.0.3 ${PORT}
@@ -1269,7 +1269,7 @@ mv -f ns3/Kremovedkeys-secondary* ns3/removedkeys
 # Ensure the wait_until_raw_zone_update_is_processed() call below will ignore
 # log messages generated before the raw zone is updated.
 nextpart ns3/named.run > /dev/null
-# Add a record to the raw zone on the master.
+# Add a record to the raw zone on the primary.
 $NSUPDATE << EOF || ret=1
 zone removedkeys-secondary.
 server 10.53.0.2 ${PORT}
@@ -1296,7 +1296,7 @@ BUMPED_SOA=`sed -n 's/.*\(add removedkeys-secondary.*IN.*SOA\)/\1/p;' ns2/named.
 # Ensure the wait_until_raw_zone_update_is_processed() call below will ignore
 # log messages generated before the raw zone is updated.
 nextpart ns3/named.run > /dev/null
-# Bump the SOA serial number of the raw zone on the master.
+# Bump the SOA serial number of the raw zone on the primary.
 $NSUPDATE << EOF || ret=1
 zone removedkeys-secondary.
 server 10.53.0.2 ${PORT}
@@ -1313,7 +1313,7 @@ grep "RRSIG" dig.out.ns3.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-# Check that the master file $2 for zone $1 does not contain RRSIG records
+# Check that the file $2 for zone $1 does not contain RRSIG records
 # while the journal file for that zone does contain them.
 ensure_sigs_only_in_journal() {
 	origin="$1"
@@ -1338,7 +1338,7 @@ check_done_signing () (
     [ $num -eq 2 ]
 )
 retry_quiet 10 check_done_signing || ret=1
-# Halt rather than stopping the server to prevent the master file from being
+# Halt rather than stopping the server to prevent the file from being
 # flushed upon shutdown since we specifically want to avoid it.
 $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3
 ensure_sigs_only_in_journal delayedkeys ns3/delayedkeys.db.signed
@@ -1355,7 +1355,7 @@ nextpart ns3/named.run > /dev/null
 start_server --noclean --restart --port ${PORT} inline ns3
 # We can now test whether the secure zone journal was correctly processed:
 # unless the records contained in it were scheduled for resigning, no resigning
-# event will be scheduled at all since the secure zone master file contains no
+# event will be scheduled at all since the secure zone file contains no
 # DNSSEC records.
 wait_for_log 20 "all zones loaded" ns3/named.run || ret=1
 $RNDCCMD 10.53.0.3 zonestatus delayedkeys > rndc.out.ns3.post.test$n 2>&1 || ret=1
@@ -1364,18 +1364,18 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 n=`expr $n + 1`
 
-echo_i "check that zonestatus reports 'type: master' for a inline master zone ($n)"
+echo_i "check that zonestatus reports 'type: primary' for an inline primary zone ($n)"
 ret=0
 $RNDCCMD 10.53.0.3 zonestatus master > rndc.out.ns3.test$n
-grep "type: master" rndc.out.ns3.test$n > /dev/null || ret=1
+grep "type: primary" rndc.out.ns3.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "check that zonestatus reports 'type: slave' for a inline slave zone ($n)"
+echo_i "check that zonestatus reports 'type: secondary' for an inline secondary zone ($n)"
 ret=0
 $RNDCCMD 10.53.0.3 zonestatus bits > rndc.out.ns3.test$n
-grep "type: slave" rndc.out.ns3.test$n > /dev/null || ret=1
+grep "type: secondary" rndc.out.ns3.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
diff --git a/bin/tests/system/integrity/ns1/named.conf.in b/bin/tests/system/integrity/ns1/named.conf.in
index bc043326ee..1f60cf35b0 100644
--- a/bin/tests/system/integrity/ns1/named.conf.in
+++ b/bin/tests/system/integrity/ns1/named.conf.in
@@ -29,83 +29,83 @@ zone "." {
 };
 
 zone "mx-cname-fail" {
-	type master;
+	type primary;
 	check-integrity yes;
 	check-mx-cname fail;
 	file "mx-cname.db";
 };
 
 zone "mx-cname-warn" {
-	type master;
+	type primary;
 	check-integrity yes;
 	check-mx-cname warn;
 	file "mx-cname.db";
 };
 
 zone "mx-cname-ignore" {
-	type master;
+	type primary;
 	check-integrity yes;
 	check-mx-cname ignore;
 	file "mx-cname.db";
 };
 
 zone "no-mx-cname-fail" {
-	type master;
+	type primary;
 	check-integrity no;
 	check-mx-cname fail;
 	file "mx-cname.db";
 };
 
 zone "no-mx-cname-warn" {
-	type master;
+	type primary;
 	check-integrity no;
 	check-mx-cname warn;
 	file "mx-cname.db";
 };
 
 zone "no-mx-cname-ignore" {
-	type master;
+	type primary;
 	check-integrity no;
 	check-mx-cname ignore;
 	file "mx-cname.db";
 };
 
 zone "srv-cname-fail" {
-	type master;
+	type primary;
 	check-integrity yes;
 	check-srv-cname fail;
 	file "srv-cname.db";
 };
 
 zone "srv-cname-warn" {
-	type master;
+	type primary;
 	check-integrity yes;
 	check-srv-cname warn;
 	file "srv-cname.db";
 };
 
 zone "srv-cname-ignore" {
-	type master;
+	type primary;
 	check-integrity yes;
 	check-srv-cname ignore;
 	file "srv-cname.db";
 };
 zone "no-srv-cname-fail" {
-	type master;
+	type primary;
 	check-integrity no;
 	check-srv-cname fail;
 	file "srv-cname.db";
 };
 
 zone "no-srv-cname-warn" {
-	type master;
+	type primary;
 	check-integrity no;
 	check-srv-cname warn;
 	file "srv-cname.db";
 };
 
 zone "no-srv-cname-ignore" {
-	type master;
+	type primary;
 	check-integrity no;
 	check-srv-cname ignore;
 	file "srv-cname.db";
diff --git a/bin/tests/system/ixfr/ns3/named.conf.in b/bin/tests/system/ixfr/ns3/named.conf.in
index fe1f7567f6..96d5ab027a 100644
--- a/bin/tests/system/ixfr/ns3/named.conf.in
+++ b/bin/tests/system/ixfr/ns3/named.conf.in
@@ -35,16 +35,16 @@ view "primary" {
 	ixfr-from-differences yes;
 	request-ixfr yes;
 	zone "test" IN {
-		type master;
+		type primary;
 		file "mytest.db";
 		max-ixfr-ratio 75%;
 	};
 	zone "sub.test" IN {
-		type master;
+		type primary;
 		file "subtest.db";
 	};
 	zone "large" IN {
-		type master;
+		type primary;
 		file "large.db";
 	};
 };
diff --git a/bin/tests/system/ixfr/ns4/named.conf.in b/bin/tests/system/ixfr/ns4/named.conf.in
index 601aed88a5..ef70229ad9 100644
--- a/bin/tests/system/ixfr/ns4/named.conf.in
+++ b/bin/tests/system/ixfr/ns4/named.conf.in
@@ -34,13 +34,13 @@ view "primary" {
 	ixfr-from-differences yes;
 	request-ixfr yes;
 	zone "test" IN {
-		type slave;
+		type secondary;
 		file "mytest.db";
 		primaries { 10.53.0.3; };
 		max-ixfr-ratio unlimited;
 	};
 	zone "sub.test" IN {
-		type slave;
+		type secondary;
 		file "subtest.db";
 		request-ixfr no;
 		primaries { 10.53.0.3; };
diff --git a/bin/tests/system/ixfr/ns5/named.conf.in b/bin/tests/system/ixfr/ns5/named.conf.in
index 71129f6a0b..a511d5b359 100644
--- a/bin/tests/system/ixfr/ns5/named.conf.in
+++ b/bin/tests/system/ixfr/ns5/named.conf.in
@@ -35,12 +35,12 @@ view "primary" {
 	ixfr-from-differences yes;
 	request-ixfr yes;
 	zone "test" IN {
-		type slave;
+		type secondary;
 		file "mytest.db";
 		primaries { 10.53.0.3; };
 	};
 	zone "sub.test" IN {
-		type slave;
+		type secondary;
 		file "subtest.db";
 		request-ixfr no;
 		primaries { 10.53.0.3; };
diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index 775e5f2e12..60d77a97af 100644
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -56,13 +56,13 @@ sleep 1
 
 # Initially, ns1 is not authoritative for anything (see setup.sh).
 # Now that ans is up and running with the right data, we make it
-# a slave for nil.
+# a secondary for nil.
 
 cat <<EOF >>ns1/named.conf
 zone "nil" {
-	type slave;
+	type secondary;
 	file "myftp.db";
-	masters { 10.53.0.2; };
+	primaries { 10.53.0.2; };
 };
 EOF
 
@@ -144,7 +144,7 @@ status=$((status+ret))
 
 n=$((n+1))
 echo_i "testing ixfr-from-differences option ($n)"
-# ns3 is master; ns4 is slave
+# ns3 is primary; ns4 is secondary
 $CHECKZONE test. ns3/mytest.db > /dev/null 2>&1
 if [ $? -ne 0 ]
 then
@@ -155,14 +155,14 @@ retry_quiet 10 wait_for_serial 10.53.0.4 test. 1 dig.out.test$n || ret=1
 
 nextpart ns4/named.run > /dev/null
 
-# modify the master
+# modify the primary
 cp ns3/mytest1.db ns3/mytest.db
 $RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
 
-# wait for master to reload
+# wait for primary to reload
 retry_quiet 10 wait_for_serial 10.53.0.3 test. 2 dig.out.test$n || ret=1
 
-# wait for slave to reload
+# wait for secondary to reload
 tret=0
 retry_quiet 5 wait_for_serial 10.53.0.4 test. 2 dig.out.test$n || tret=1
 if [ $tret -eq 1 ]; then
@@ -187,10 +187,10 @@ cp ns3/subtest1.db ns3/subtest.db # change to sub.test zone, should be AXFR
 nextpart ns4/named.run > /dev/null
 $RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
 
-# wait for master to reload
+# wait for primary to reload
 retry_quiet 10 wait_for_serial 10.53.0.3 sub.test. 3 dig.out.test$n || ret=1
 
-# wait for slave to reload
+# wait for secondary to reload
 tret=0
 retry_quiet 5 wait_for_serial 10.53.0.4 sub.test. 3 dig.out.test$n || tret=1
 if [ $tret -eq 1 ]; then
@@ -210,10 +210,10 @@ cp ns3/mytest2.db ns3/mytest.db # change to test zone, should be IXFR
 nextpart ns4/named.run > /dev/null
 $RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
 
-# wait for master to reload
+# wait for primary to reload
 retry_quiet 10 wait_for_serial 10.53.0.3 test. 3 dig.out.test$n || ret=1
 
-# wait for slave to reload
+# wait for secondary to reload
 tret=0
 retry_quiet 5 wait_for_serial 10.53.0.4 test. 3 dig.out.test$n || tret=1
 if [ $tret -eq 1 ]; then
@@ -258,7 +258,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 # make sure ns5 has transfered the zone
-# wait for slave to reload
+# wait for secondary to reload
 tret=0
 retry_quiet 5 wait_for_serial 10.53.0.5 test. 4 dig.out.test$n || tret=1
 if [ $tret -eq 1 ]; then
@@ -346,7 +346,7 @@ nextpart ns4/named.run > /dev/null
 cp ns3/mytest3.db ns3/mytest.db # change to test zone, too big for IXFR
 $RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
 
-# wait for slave to reload
+# wait for secondary to reload
 tret=0
 retry_quiet 5 wait_for_serial 10.53.0.4 test. 4 dig.out.test$n || tret=1
 if [ $tret -eq 1 ]; then
diff --git a/bin/tests/system/kasp/ns2/named.conf.in b/bin/tests/system/kasp/ns2/named.conf.in
index cad71da5b4..3168745d56 100644
--- a/bin/tests/system/kasp/ns2/named.conf.in
+++ b/bin/tests/system/kasp/ns2/named.conf.in
@@ -36,14 +36,14 @@ controls {
 /* Inherit dnssec-policy (which is none) */
 
 zone "unsigned.tld" {
-	type master;
+	type primary;
 	file "unsigned.tld.db";
 };
 
 /* Override dnssec-policy */
 
 zone "signed.tld" {
-	type master;
+	type primary;
 	dnssec-policy "default";
 	file "signed.tld.db";
 };
@@ -51,7 +51,7 @@ zone "signed.tld" {
 /* Primary service for ns3 */
 
 zone "secondary.kasp" {
-	type master;
+	type primary;
 	file "secondary.kasp.db";
 	allow-transfer { 10.53.0.3; };
 	notify yes;
diff --git a/bin/tests/system/kasp/ns3/named.conf.in b/bin/tests/system/kasp/ns3/named.conf.in
index 39460d5f1b..8a7f3ebd48 100644
--- a/bin/tests/system/kasp/ns3/named.conf.in
+++ b/bin/tests/system/kasp/ns3/named.conf.in
@@ -40,41 +40,41 @@ controls {
 
 /* The default case: No keys created, using default policy. */
 zone "default.kasp" {
-	type master;
+	type primary;
 	file "default.kasp.db";
 	dnssec-policy "default";
 };
 
 /* Key lifetime unlimited. */
 zone "unlimited.kasp" {
-	type master;
+	type primary;
 	file "unlimited.kasp.db";
 	dnssec-policy "unlimited";
 };
 
 /* A master zone with dnssec-policy, no keys created. */
 zone "rsasha1.kasp" {
-	type master;
+	type primary;
 	file "rsasha1.kasp.db";
 	dnssec-policy "rsasha1";
 };
 
 /* A zone that inherits dnssec-policy. */
 zone "inherit.kasp" {
-	type master;
+	type primary;
 	file "inherit.kasp.db";
 };
 
 /* A zone that overrides dnssec-policy. */
 zone "unsigned.kasp" {
-	type master;
+	type primary;
 	file "unsigned.kasp.db";
 	dnssec-policy "none";
 };
 
 /* A master zone with dnssec-policy but keys already created. */
 zone "dnssec-keygen.kasp" {
-	type master;
+	type primary;
 	file "dnssec-keygen.kasp.db";
 	dnssec-policy "rsasha1";
 };
@@ -89,7 +89,7 @@ zone "secondary.kasp" {
 
 /* A dynamic zone with dnssec-policy. */
 zone "dynamic.kasp" {
-	type master;
+	type primary;
 	file "dynamic.kasp.db";
 	dnssec-policy "default";
 	allow-update { any; };
@@ -97,7 +97,7 @@ zone "dynamic.kasp" {
 
 /* A dynamic inline-signed zone with dnssec-policy. */
 zone "dynamic-inline-signing.kasp" {
-	type master;
+	type primary;
 	file "dynamic-inline-signing.kasp.db";
 	dnssec-policy "default";
 	allow-update { any; };
@@ -106,7 +106,7 @@ zone "dynamic-inline-signing.kasp" {
 
 /* An inline-signed zone with dnssec-policy. */
 zone "inline-signing.kasp" {
-	type master;
+	type primary;
 	file "inline-signing.kasp.db";
 	dnssec-policy "default";
 	inline-signing yes;
@@ -116,7 +116,7 @@ zone "inline-signing.kasp" {
  * A configured dnssec-policy but some keys already created.
  */
 zone "some-keys.kasp" {
-	type master;
+	type primary;
 	file "some-keys.kasp.db";
 	dnssec-policy "rsasha1";
 };
@@ -125,7 +125,7 @@ zone "some-keys.kasp" {
  * A configured dnssec-policy but some keys already in use.
  */
 zone "legacy-keys.kasp" {
-	type master;
+	type primary;
 	file "legacy-keys.kasp.db";
 	dnssec-policy "rsasha1";
 };
@@ -134,7 +134,7 @@ zone "legacy-keys.kasp" {
  * A configured dnssec-policy with (too) many keys pregenerated.
  */
 zone "pregenerated.kasp" {
-	type master;
+	type primary;
 	file "pregenerated.kasp.db";
 	dnssec-policy "rsasha1";
 };
@@ -144,7 +144,7 @@ zone "pregenerated.kasp" {
  * Bugfix case for GL #1593.
  */
 zone "rumoured.kasp" {
-	type master;
+	type primary;
 	file "rumoured.kasp.db";
 	dnssec-policy "rsasha1";
 };
@@ -153,27 +153,27 @@ zone "rumoured.kasp" {
  * Different algorithms.
  */
 zone "rsasha1-nsec3.kasp" {
-	type master;
+	type primary;
 	file "rsasha1-nsec3.kasp.db";
 	dnssec-policy "rsasha1-nsec3";
 };
 zone "rsasha256.kasp" {
-	type master;
+	type primary;
 	file "rsasha256.kasp.db";
 	dnssec-policy "rsasha256";
 };
 zone "rsasha512.kasp" {
-	type master;
+	type primary;
 	file "rsasha512.kasp.db";
 	dnssec-policy "rsasha512";
 };
 zone "ecdsa256.kasp" {
-	type master;
+	type primary;
 	file "ecdsa256.kasp.db";
 	dnssec-policy "ecdsa256";
 };
 zone "ecdsa384.kasp" {
-	type master;
+	type primary;
 	file "ecdsa384.kasp.db";
 	dnssec-policy "ecdsa384";
 };
@@ -186,7 +186,7 @@ zone "ecdsa384.kasp" {
  * Zone that has expired signatures.
  */
 zone "expired-sigs.autosign" {
-	type master;
+	type primary;
 	file "expired-sigs.autosign.db";
 	dnssec-policy "autosign";
 };
@@ -195,7 +195,7 @@ zone "expired-sigs.autosign" {
  * Zone that has valid, fresh signatures.
  */
 zone "fresh-sigs.autosign" {
-	type master;
+	type primary;
 	file "fresh-sigs.autosign.db";
 	dnssec-policy "autosign";
 };
@@ -204,7 +204,7 @@ zone "fresh-sigs.autosign" {
  * Zone that has unfresh signatures.
  */
 zone "unfresh-sigs.autosign" {
-	type master;
+	type primary;
 	file "unfresh-sigs.autosign.db";
 	dnssec-policy "autosign";
 };
@@ -213,7 +213,7 @@ zone "unfresh-sigs.autosign" {
  * Zone that has missing private ZSK.
  */
 zone "zsk-missing.autosign" {
-	type master;
+	type primary;
 	file "zsk-missing.autosign.db";
 	dnssec-policy "autosign";
 };
@@ -222,7 +222,7 @@ zone "zsk-missing.autosign" {
  * Zone that has inactive ZSK.
  */
 zone "zsk-retired.autosign" {
-	type master;
+	type primary;
 	file "zsk-retired.autosign.db";
 	dnssec-policy "autosign";
 };
@@ -231,22 +231,22 @@ zone "zsk-retired.autosign" {
  * Zones for testing enabling DNSSEC.
  */
 zone "step1.enable-dnssec.autosign" {
-	type master;
+	type primary;
 	file "step1.enable-dnssec.autosign.db";
 	dnssec-policy "enable-dnssec";
 };
 zone "step2.enable-dnssec.autosign" {
-	type master;
+	type primary;
 	file "step2.enable-dnssec.autosign.db";
 	dnssec-policy "enable-dnssec";
 };
 zone "step3.enable-dnssec.autosign" {
-	type master;
+	type primary;
 	file "step3.enable-dnssec.autosign.db";
 	dnssec-policy "enable-dnssec";
 };
 zone "step4.enable-dnssec.autosign" {
-	type master;
+	type primary;
 	file "step4.enable-dnssec.autosign.db";
 	dnssec-policy "enable-dnssec";
 };
@@ -255,27 +255,27 @@ zone "step4.enable-dnssec.autosign" {
  * Zones for testing ZSK Pre-Publication steps.
  */
 zone "step1.zsk-prepub.autosign" {
-	type master;
+	type primary;
 	file "step1.zsk-prepub.autosign.db";
 	dnssec-policy "zsk-prepub";
 };
 zone "step2.zsk-prepub.autosign" {
-	type master;
+	type primary;
 	file "step2.zsk-prepub.autosign.db";
 	dnssec-policy "zsk-prepub";
 };
 zone "step3.zsk-prepub.autosign" {
-	type master;
+	type primary;
 	file "step3.zsk-prepub.autosign.db";
 	dnssec-policy "zsk-prepub";
 };
 zone "step4.zsk-prepub.autosign" {
-	type master;
+	type primary;
 	file "step4.zsk-prepub.autosign.db";
 	dnssec-policy "zsk-prepub";
 };
 zone "step5.zsk-prepub.autosign" {
-	type master;
+	type primary;
 	file "step5.zsk-prepub.autosign.db";
 	dnssec-policy "zsk-prepub";
 };
@@ -284,27 +284,27 @@ zone "step5.zsk-prepub.autosign" {
  * Zones for testing KSK Double-KSK steps.
  */
 zone "step1.ksk-doubleksk.autosign" {
-	type master;
+	type primary;
 	file "step1.ksk-doubleksk.autosign.db";
 	dnssec-policy "ksk-doubleksk";
 };
 zone "step2.ksk-doubleksk.autosign" {
-	type master;
+	type primary;
 	file "step2.ksk-doubleksk.autosign.db";
 	dnssec-policy "ksk-doubleksk";
 };
 zone "step3.ksk-doubleksk.autosign" {
-	type master;
+	type primary;
 	file "step3.ksk-doubleksk.autosign.db";
 	dnssec-policy "ksk-doubleksk";
 };
 zone "step4.ksk-doubleksk.autosign" {
-	type master;
+	type primary;
 	file "step4.ksk-doubleksk.autosign.db";
 	dnssec-policy "ksk-doubleksk";
 };
 zone "step5.ksk-doubleksk.autosign" {
-	type master;
+	type primary;
 	file "step5.ksk-doubleksk.autosign.db";
 	dnssec-policy "ksk-doubleksk";
 };
@@ -313,68 +313,68 @@ zone "step5.ksk-doubleksk.autosign" {
  * Zones for testing CSK rollover steps.
  */
 zone "step1.csk-roll.autosign" {
-	type master;
+	type primary;
 	file "step1.csk-roll.autosign.db";
 	dnssec-policy "csk-roll";
 };
 zone "step2.csk-roll.autosign" {
-	type master;
+	type primary;
 	file "step2.csk-roll.autosign.db";
 	dnssec-policy "csk-roll";
 };
 zone "step3.csk-roll.autosign" {
-	type master;
+	type primary;
 	file "step3.csk-roll.autosign.db";
 	dnssec-policy "csk-roll";
 };
 zone "step4.csk-roll.autosign" {
-	type master;
+	type primary;
 	file "step4.csk-roll.autosign.db";
 	dnssec-policy "csk-roll";
 };
 zone "step5.csk-roll.autosign" {
-	type master;
+	type primary;
 	file "step5.csk-roll.autosign.db";
 	dnssec-policy "csk-roll";
 };
 zone "step6.csk-roll.autosign" {
-	type master;
+	type primary;
 	file "step6.csk-roll.autosign.db";
 	dnssec-policy "csk-roll";
 };
 zone "step7.csk-roll.autosign" {
-	type master;
+	type primary;
 	file "step7.csk-roll.autosign.db";
 	dnssec-policy "csk-roll";
 };
 
 zone "step1.csk-roll2.autosign" {
-	type master;
+	type primary;
 	file "step1.csk-roll2.autosign.db";
 	dnssec-policy "csk-roll2";
 };
 zone "step2.csk-roll2.autosign" {
-	type master;
+	type primary;
 	file "step2.csk-roll2.autosign.db";
 	dnssec-policy "csk-roll2";
 };
 zone "step3.csk-roll2.autosign" {
-	type master;
+	type primary;
 	file "step3.csk-roll2.autosign.db";
 	dnssec-policy "csk-roll2";
 };
 zone "step4.csk-roll2.autosign" {
-	type master;
+	type primary;
 	file "step4.csk-roll2.autosign.db";
 	dnssec-policy "csk-roll2";
 };
 zone "step5.csk-roll2.autosign" {
-	type master;
+	type primary;
 	file "step5.csk-roll2.autosign.db";
 	dnssec-policy "csk-roll2";
 };
 zone "step6.csk-roll2.autosign" {
-	type master;
+	type primary;
 	file "step6.csk-roll2.autosign.db";
 	dnssec-policy "csk-roll2";
 };
diff --git a/bin/tests/system/kasp/ns4/named.conf.in b/bin/tests/system/kasp/ns4/named.conf.in
index 5f9b8c9fae..5743d71ac1 100644
--- a/bin/tests/system/kasp/ns4/named.conf.in
+++ b/bin/tests/system/kasp/ns4/named.conf.in
@@ -66,20 +66,20 @@ view "inherit" {
 
 	/* Inherit dnssec-policy 'test' */
 	zone "inherit.inherit.signed" {
-		type master;
+		type primary;
 		file "inherit.inherit.signed.db";
 	};
 
 	/* Override dnssec-policy */
 	zone "override.inherit.signed" {
-		type master;
+		type primary;
 		dnssec-policy "default";
 		file "override.inherit.signed.db";
 	};
 
 	/* Unset dnssec-policy */
 	zone "none.inherit.signed" {
-		type master;
+		type primary;
 		dnssec-policy "none";
 		file "none.inherit.signed.db";
 	};
@@ -91,20 +91,20 @@ view "override" {
 
 	/* Inherit dnssec-policy 'test' */
 	zone "inherit.override.signed" {
-		type master;
+		type primary;
 		file "inherit.override.signed.db";
 	};
 
 	/* Override dnssec-policy */
 	zone "override.override.signed" {
-		type master;
+		type primary;
 		dnssec-policy "test";
 		file "override.override.signed.db";
 	};
 
 	/* Unset dnssec-policy */
 	zone "none.override.signed" {
-		type master;
+		type primary;
 		dnssec-policy "none";
 		file "none.override.signed.db";
 	};
@@ -116,20 +116,20 @@ view "none" {
 
 	/* Inherit dnssec-policy 'none' */
 	zone "inherit.none.signed" {
-		type master;
+		type primary;
 		file "inherit.none.signed.db";
 	};
 
 	/* Override dnssec-policy */
 	zone "override.none.signed" {
-		type master;
+		type primary;
 		dnssec-policy "test";
 		file "override.none.signed.db";
 	};
 
 	/* Unset dnssec-policy */
 	zone "none.none.signed" {
-		type master;
+		type primary;
 		dnssec-policy "none";
 		file "none.none.signed.db";
 	};
@@ -139,7 +139,7 @@ view "example1" {
 	match-clients { key "keyforview1"; };
 
 	zone "example.net" {
-		type master;
+		type primary;
 		file "example1.db";
 	};
 };
@@ -148,7 +148,7 @@ view "example2" {
 	match-clients { key "keyforview2"; };
 
 	zone "example.net" {
-		type master;
+		type primary;
 		file "example2.db";
 	};
 };
diff --git a/bin/tests/system/kasp/ns5/named.conf.in b/bin/tests/system/kasp/ns5/named.conf.in
index 3601c7b16f..a2f2fd19ef 100644
--- a/bin/tests/system/kasp/ns5/named.conf.in
+++ b/bin/tests/system/kasp/ns5/named.conf.in
@@ -56,20 +56,20 @@ view "inherit" {
 
 	/* Inherit dnssec-policy 'none' */
 	zone "inherit.inherit.unsigned" {
-		type master;
+		type primary;
 		file "inherit.inherit.unsigned.db";
 	};
 
 	/* Override dnssec-policy */
 	zone "override.inherit.unsigned" {
-		type master;
+		type primary;
 		dnssec-policy "default";
 		file "override.inherit.unsigned.db";
 	};
 
 	/* Unset dnssec-policy */
 	zone "none.inherit.unsigned" {
-		type master;
+		type primary;
 		dnssec-policy "none";
 		file "none.inherit.unsigned.db";
 	};
@@ -81,20 +81,20 @@ view "override" {
 
 	/* Inherit dnssec-policy 'default' */
 	zone "inherit.override.unsigned" {
-		type master;
+		type primary;
 		file "inherit.override.unsigned.db";
 	};
 
 	/* Override dnssec-policy */
 	zone "override.override.unsigned" {
-		type master;
+		type primary;
 		dnssec-policy "test";
 		file "override.override.unsigned.db";
 	};
 
 	/* Unset dnssec-policy */
 	zone "none.override.unsigned" {
-		type master;
+		type primary;
 		dnssec-policy "none";
 		file "none.override.unsigned.db";
 	};
@@ -106,20 +106,20 @@ view "none" {
 
 	/* Inherit dnssec-policy 'none' */
 	zone "inherit.none.unsigned" {
-		type master;
+		type primary;
 		file "inherit.none.unsigned.db";
 	};
 
 	/* Override dnssec-policy */
 	zone "override.none.unsigned" {
-		type master;
+		type primary;
 		dnssec-policy "test";
 		file "override.none.unsigned.db";
 	};
 
 	/* Unset dnssec-policy */
 	zone "none.none.unsigned" {
-		type master;
+		type primary;
 		dnssec-policy "none";
 		file "none.none.unsigned.db";
 	};
diff --git a/bin/tests/system/kasp/ns6/named.conf.in b/bin/tests/system/kasp/ns6/named.conf.in
index 943c95f120..5053329e4e 100644
--- a/bin/tests/system/kasp/ns6/named.conf.in
+++ b/bin/tests/system/kasp/ns6/named.conf.in
@@ -38,7 +38,7 @@ controls {
 
 /* These are zones that migrate to dnssec-policy. */
 zone "migrate.kasp" {
-	type master;
+	type primary;
 	file "migrate.kasp.db";
 	auto-dnssec maintain;
 	allow-update { any; };
@@ -47,7 +47,7 @@ zone "migrate.kasp" {
 };
 
 zone "migrate-nomatch-algnum.kasp" {
-	type master;
+	type primary;
 	file "migrate-nomatch-algnum.kasp.db";
 	auto-dnssec maintain;
 	allow-update { any; };
@@ -56,7 +56,7 @@ zone "migrate-nomatch-algnum.kasp" {
 };
 
 zone "migrate-nomatch-alglen.kasp" {
-	type master;
+	type primary;
 	file "migrate-nomatch-alglen.kasp.db";
 	auto-dnssec maintain;
 	allow-update { any; };
@@ -66,13 +66,13 @@ zone "migrate-nomatch-alglen.kasp" {
 
 /* These are alorithm rollover test zones. */
 zone "step1.algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step1.algorithm-roll.kasp.db";
 	dnssec-policy "rsasha1";
 };
 
 zone "step1.csk-algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step1.csk-algorithm-roll.kasp.db";
 	dnssec-policy "csk-algoroll";
 };
diff --git a/bin/tests/system/kasp/ns6/named2.conf.in b/bin/tests/system/kasp/ns6/named2.conf.in
index 4405939321..d07ee9eb6e 100644
--- a/bin/tests/system/kasp/ns6/named2.conf.in
+++ b/bin/tests/system/kasp/ns6/named2.conf.in
@@ -37,21 +37,21 @@ controls {
 
 /* These are zones that migrate to dnssec-policy. */
 zone "migrate.kasp" {
-	type master;
+	type primary;
 	file "migrate.kasp.db";
 	allow-update { any; };
 	dnssec-policy "migrate";
 };
 
 zone "migrate-nomatch-algnum.kasp" {
-	type master;
+	type primary;
 	file "migrate-nomatch-algnum.kasp.db";
 	allow-update { any; };
 	dnssec-policy "migrate-nomatch-algnum";
 };
 
 zone "migrate-nomatch-alglen.kasp" {
-	type master;
+	type primary;
 	file "migrate-nomatch-alglen.kasp.db";
 	allow-update { any; };
 	dnssec-policy "migrate-nomatch-alglen";
@@ -61,37 +61,37 @@ zone "migrate-nomatch-alglen.kasp" {
  * Zones for testing KSK/ZSK algorithm roll.
  */
 zone "step1.algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step1.algorithm-roll.kasp.db";
 	dnssec-policy "ecdsa256";
 };
 
 zone "step2.algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step2.algorithm-roll.kasp.db";
 	dnssec-policy "ecdsa256";
 };
 
 zone "step3.algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step3.algorithm-roll.kasp.db";
 	dnssec-policy "ecdsa256";
 };
 
 zone "step4.algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step4.algorithm-roll.kasp.db";
 	dnssec-policy "ecdsa256";
 };
 
 zone "step5.algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step5.algorithm-roll.kasp.db";
 	dnssec-policy "ecdsa256";
 };
 
 zone "step6.algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step6.algorithm-roll.kasp.db";
 	dnssec-policy "ecdsa256";
 };
@@ -100,37 +100,37 @@ zone "step6.algorithm-roll.kasp" {
  * Zones for testing CSK algorithm roll.
  */
 zone "step1.csk-algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step1.csk-algorithm-roll.kasp.db";
 	dnssec-policy "csk-algoroll";
 };
 
 zone "step2.csk-algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step2.csk-algorithm-roll.kasp.db";
 	dnssec-policy "csk-algoroll";
 };
 
 zone "step3.csk-algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step3.csk-algorithm-roll.kasp.db";
 	dnssec-policy "csk-algoroll";
 };
 
 zone "step4.csk-algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step4.csk-algorithm-roll.kasp.db";
 	dnssec-policy "csk-algoroll";
 };
 
 zone "step5.csk-algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step5.csk-algorithm-roll.kasp.db";
 	dnssec-policy "csk-algoroll";
 };
 
 zone "step6.csk-algorithm-roll.kasp" {
-	type master;
+	type primary;
 	file "step6.csk-algorithm-roll.kasp.db";
 	dnssec-policy "csk-algoroll";
 };
diff --git a/bin/tests/system/keepalive/ns1/named.conf.in b/bin/tests/system/keepalive/ns1/named.conf.in
index 828bc40b7b..88e0781ee8 100644
--- a/bin/tests/system/keepalive/ns1/named.conf.in
+++ b/bin/tests/system/keepalive/ns1/named.conf.in
@@ -31,6 +31,6 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/keepalive/ns2/named.conf.in b/bin/tests/system/keepalive/ns2/named.conf.in
index 4406a45e47..c24fbdcabd 100644
--- a/bin/tests/system/keepalive/ns2/named.conf.in
+++ b/bin/tests/system/keepalive/ns2/named.conf.in
@@ -38,6 +38,6 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/legacy/ns1/named1.conf.in b/bin/tests/system/legacy/ns1/named1.conf.in
index 06881906da..67cac6684a 100644
--- a/bin/tests/system/legacy/ns1/named1.conf.in
+++ b/bin/tests/system/legacy/ns1/named1.conf.in
@@ -31,6 +31,6 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/legacy/ns1/named2.conf.in b/bin/tests/system/legacy/ns1/named2.conf.in
index 9a5581786f..f918dedec4 100644
--- a/bin/tests/system/legacy/ns1/named2.conf.in
+++ b/bin/tests/system/legacy/ns1/named2.conf.in
@@ -22,7 +22,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
diff --git a/bin/tests/system/legacy/ns10/named.conf.in b/bin/tests/system/legacy/ns10/named.conf.in
index e7bf8b256a..486ac7fea9 100644
--- a/bin/tests/system/legacy/ns10/named.conf.in
+++ b/bin/tests/system/legacy/ns10/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "ednsrefused" {
-	type master;
+	type primary;
 	file "ednsrefused.db";
 };
diff --git a/bin/tests/system/legacy/ns2/named.conf.in b/bin/tests/system/legacy/ns2/named.conf.in
index 1e0a55a889..740f187752 100644
--- a/bin/tests/system/legacy/ns2/named.conf.in
+++ b/bin/tests/system/legacy/ns2/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "dropedns" {
-	type master;
+	type primary;
 	file "dropedns.db";
 };
diff --git a/bin/tests/system/legacy/ns3/named.conf.in b/bin/tests/system/legacy/ns3/named.conf.in
index e4c2c1bab5..0fef64e300 100644
--- a/bin/tests/system/legacy/ns3/named.conf.in
+++ b/bin/tests/system/legacy/ns3/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "dropedns-notcp" {
-	type master;
+	type primary;
 	file "dropedns-notcp.db";
 };
diff --git a/bin/tests/system/legacy/ns4/named.conf.in b/bin/tests/system/legacy/ns4/named.conf.in
index 068c99ec8b..17f8d4c7ad 100644
--- a/bin/tests/system/legacy/ns4/named.conf.in
+++ b/bin/tests/system/legacy/ns4/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "plain" {
-	type master;
+	type primary;
 	file "plain.db";
 };
diff --git a/bin/tests/system/legacy/ns5/named.conf.in b/bin/tests/system/legacy/ns5/named.conf.in
index 283b174762..bff6f2d047 100644
--- a/bin/tests/system/legacy/ns5/named.conf.in
+++ b/bin/tests/system/legacy/ns5/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "plain-notcp" {
-	type master;
+	type primary;
 	file "plain-notcp.db";
 };
diff --git a/bin/tests/system/legacy/ns6/named.conf.in b/bin/tests/system/legacy/ns6/named.conf.in
index a62ccf1db3..4849ded2a5 100644
--- a/bin/tests/system/legacy/ns6/named.conf.in
+++ b/bin/tests/system/legacy/ns6/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "edns512" {
-	type master;
+	type primary;
 	file "edns512.db.signed";
 };
diff --git a/bin/tests/system/legacy/ns7/named.conf.in b/bin/tests/system/legacy/ns7/named.conf.in
index 6aa47013f7..68bf98ce6b 100644
--- a/bin/tests/system/legacy/ns7/named.conf.in
+++ b/bin/tests/system/legacy/ns7/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "edns512-notcp" {
-	type master;
+	type primary;
 	file "edns512-notcp.db.signed";
 };
diff --git a/bin/tests/system/legacy/ns8/named.conf.in b/bin/tests/system/legacy/ns8/named.conf.in
index dc4ce6b37b..b743c7d278 100644
--- a/bin/tests/system/legacy/ns8/named.conf.in
+++ b/bin/tests/system/legacy/ns8/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "ednsformerr" {
-	type master;
+	type primary;
 	file "ednsformerr.db";
 };
diff --git a/bin/tests/system/legacy/ns9/named.conf.in b/bin/tests/system/legacy/ns9/named.conf.in
index 34ac3af85e..4571dec4c1 100644
--- a/bin/tests/system/legacy/ns9/named.conf.in
+++ b/bin/tests/system/legacy/ns9/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "ednsnotimp" {
-	type master;
+	type primary;
 	file "ednsnotimp.db";
 };
diff --git a/bin/tests/system/limits/ns1/named.conf.in b/bin/tests/system/limits/ns1/named.conf.in
index 2395de25d3..a2724a4d30 100644
--- a/bin/tests/system/limits/ns1/named.conf.in
+++ b/bin/tests/system/limits/ns1/named.conf.in
@@ -23,11 +23,11 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.dirconf b/bin/tests/system/logfileconfig/ns1/named.dirconf
index dcc02d323e..e64ca456f3 100644
--- a/bin/tests/system/logfileconfig/ns1/named.dirconf
+++ b/bin/tests/system/logfileconfig/ns1/named.dirconf
@@ -38,6 +38,6 @@ key "rndc-key" {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601 b/bin/tests/system/logfileconfig/ns1/named.iso8601
index 0444b476c3..b8ad96c9bf 100644
--- a/bin/tests/system/logfileconfig/ns1/named.iso8601
+++ b/bin/tests/system/logfileconfig/ns1/named.iso8601
@@ -38,6 +38,6 @@ key "rndc-key" {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
index 44e91984bc..186abd1b0b 100644
--- a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
+++ b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
@@ -38,6 +38,6 @@ key "rndc-key" {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.pipeconf b/bin/tests/system/logfileconfig/ns1/named.pipeconf
index cc8fe36bb8..ba48fa9b8e 100644
--- a/bin/tests/system/logfileconfig/ns1/named.pipeconf
+++ b/bin/tests/system/logfileconfig/ns1/named.pipeconf
@@ -38,6 +38,6 @@ key "rndc-key" {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.plain b/bin/tests/system/logfileconfig/ns1/named.plain
index 0ef783254a..fff82940bf 100644
--- a/bin/tests/system/logfileconfig/ns1/named.plain
+++ b/bin/tests/system/logfileconfig/ns1/named.plain
@@ -46,6 +46,6 @@ key "rndc-key" {
 
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.plainconf b/bin/tests/system/logfileconfig/ns1/named.plainconf
index 75e0c793ed..3b6054a3da 100644
--- a/bin/tests/system/logfileconfig/ns1/named.plainconf
+++ b/bin/tests/system/logfileconfig/ns1/named.plainconf
@@ -29,6 +29,6 @@ key "rndc-key" {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.symconf b/bin/tests/system/logfileconfig/ns1/named.symconf
index 34a0e1214c..32b0d1507d 100644
--- a/bin/tests/system/logfileconfig/ns1/named.symconf
+++ b/bin/tests/system/logfileconfig/ns1/named.symconf
@@ -38,6 +38,6 @@ key "rndc-key" {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.tsconf b/bin/tests/system/logfileconfig/ns1/named.tsconf
index a1d95c4925..55df326abb 100644
--- a/bin/tests/system/logfileconfig/ns1/named.tsconf
+++ b/bin/tests/system/logfileconfig/ns1/named.tsconf
@@ -48,6 +48,6 @@ key "rndc-key" {
 
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited b/bin/tests/system/logfileconfig/ns1/named.unlimited
index cca3982731..61080538f1 100644
--- a/bin/tests/system/logfileconfig/ns1/named.unlimited
+++ b/bin/tests/system/logfileconfig/ns1/named.unlimited
@@ -48,6 +48,6 @@ key "rndc-key" {
 
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.versconf b/bin/tests/system/logfileconfig/ns1/named.versconf
index 6e293c7c7f..1310ba09b8 100644
--- a/bin/tests/system/logfileconfig/ns1/named.versconf
+++ b/bin/tests/system/logfileconfig/ns1/named.versconf
@@ -48,6 +48,6 @@ key "rndc-key" {
 
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/masterfile/ns1/named.conf.in b/bin/tests/system/masterfile/ns1/named.conf.in
index 13a813d14f..38b18b7b4a 100644
--- a/bin/tests/system/masterfile/ns1/named.conf.in
+++ b/bin/tests/system/masterfile/ns1/named.conf.in
@@ -22,16 +22,16 @@ options {
 };
 
 zone "include" {
-	type master;
+	type primary;
 	file "include.db";
 };
 
 zone "ttl1" {
-	type master;
+	type primary;
 	file "ttl1.db";
 };
 
 zone "ttl2" {
-	type master;
+	type primary;
 	file "ttl2.db";
 };
diff --git a/bin/tests/system/masterfile/ns2/named.conf.in b/bin/tests/system/masterfile/ns2/named.conf.in
index 33201e4e38..ae41ffed87 100644
--- a/bin/tests/system/masterfile/ns2/named.conf.in
+++ b/bin/tests/system/masterfile/ns2/named.conf.in
@@ -30,11 +30,11 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "missing" {
-	type master;
+	type primary;
 	file "missing.db";
 };
diff --git a/bin/tests/system/masterformat/ns1/named.conf.in b/bin/tests/system/masterformat/ns1/named.conf.in
index c1d92b7ffb..2b7c11c991 100644
--- a/bin/tests/system/masterformat/ns1/named.conf.in
+++ b/bin/tests/system/masterformat/ns1/named.conf.in
@@ -32,51 +32,51 @@ controls {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	masterfile-format raw;
 	file "example.db.raw";
 };
 
 zone "compat-example" {
-	type master;
+	type primary;
 	masterfile-format raw;
 	file "example.db.compat";
 };
 
 zone "transfer1" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-transfer { any; };
 };
 
 zone "transfer2" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-transfer { any; };
 };
 
 zone "transfer3" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-transfer { any; };
 };
 
 zone "transfer4" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-transfer { any; };
 };
 
 
 zone "large" {
-	type master;
+	type primary;
 	file "large.db.raw";
 	masterfile-format raw;
 	allow-transfer { any; };
 };
 
 zone "signed" {
-	type master;
+	type primary;
 	file "signed.db.map";
 	masterfile-format map;
 	allow-transfer { any; };
diff --git a/bin/tests/system/masterformat/ns2/named.conf.in b/bin/tests/system/masterformat/ns2/named.conf.in
index d4ce971321..4df1d37990 100644
--- a/bin/tests/system/masterformat/ns2/named.conf.in
+++ b/bin/tests/system/masterformat/ns2/named.conf.in
@@ -22,31 +22,31 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "transfer1" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "transfer.db.raw";
 };
 
 zone "transfer2" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	masterfile-format text;
 	file "transfer.db.txt";
 };
 
 zone "transfer3" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "formerly-text.db";
 };
 
 zone "transfer4" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	masterfile-format text;
 	masterfile-style full;
@@ -54,7 +54,7 @@ zone "transfer4" {
 };
 
 zone "large" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	masterfile-format raw;
 	file "large.bk";
diff --git a/bin/tests/system/masterformat/ns3/named.conf.in b/bin/tests/system/masterformat/ns3/named.conf.in
index 032505a300..075e4c1b14 100644
--- a/bin/tests/system/masterformat/ns3/named.conf.in
+++ b/bin/tests/system/masterformat/ns3/named.conf.in
@@ -30,13 +30,13 @@ controls {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	masterfile-format map;
 	file "example.db.map";
 };
 
 zone "dynamic" {
-	type master;
+	type primary;
 	masterfile-format map;
 	file "dynamic.db.map";
 	allow-update { any; };
diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index 1dbd212d22..05ff3e659b 100755
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -93,7 +93,7 @@ rndccmd() {
 
 status=0
 
-echo_i "checking that master files in raw format loaded ($n)"
+echo_i "checking that files in raw format loaded ($n)"
 ret=0
 set -- 1 2 3
 for zone in example example-explicit example-compat; do
@@ -148,14 +148,14 @@ do
 	sleep 1
 done
 
-echo_i "checking that slave was saved in raw format by default ($n)"
+echo_i "checking that secondary was saved in raw format by default ($n)"
 ret=0
 israw ns2/transfer.db.raw || ret=1
 n=$((n+1))
 [ $ret -eq 0 ] || echo_i "failed"
 status=$((status+ret))
 
-echo_i "checking that slave was saved in text format when configured ($n)"
+echo_i "checking that secondary was saved in text format when configured ($n)"
 ret=0
 israw ns2/transfer.db.txt && ret=1
 isfull ns2/transfer.db.txt && ret=1
@@ -163,14 +163,14 @@ n=$((n+1))
 [ $ret -eq 0 ] || echo_i "failed"
 status=$((status+ret))
 
-echo_i "checking that slave was saved in 'full' style when configured ($n)"
+echo_i "checking that secondary was saved in 'full' style when configured ($n)"
 ret=0
 isfull ns2/transfer.db.full > /dev/null 2>&1 || ret=1
 n=$((n+1))
 [ $ret -eq 0 ] || echo_i "failed"
 status=$((status+ret))
 
-echo_i "checking that slave formerly in text format is now raw ($n)"
+echo_i "checking that secondary formerly in text format is now raw ($n)"
 for i in 0 1 2 3 4 5 6 7 8 9
 do
     ret=0
diff --git a/bin/tests/system/mirror/ns1/named.conf.in b/bin/tests/system/mirror/ns1/named.conf.in
index 3f12a2f4f0..fda17f1c7a 100644
--- a/bin/tests/system/mirror/ns1/named.conf.in
+++ b/bin/tests/system/mirror/ns1/named.conf.in
@@ -21,6 +21,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
diff --git a/bin/tests/system/mirror/ns2/named.conf.in b/bin/tests/system/mirror/ns2/named.conf.in
index f3e78c4569..b915904efc 100644
--- a/bin/tests/system/mirror/ns2/named.conf.in
+++ b/bin/tests/system/mirror/ns2/named.conf.in
@@ -30,54 +30,54 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db.signed";
 };
 
 zone "sub.example" {
-	type master;
+	type primary;
 	file "sub.example.db.signed";
 };
 
 zone "initially-unavailable" {
-	type master;
+	type primary;
 	file "initially-unavailable.db.signed";
 	allow-transfer { 10.53.0.254; };
 };
 
 zone "verify-addzone" {
-	type master;
+	type primary;
 	file "verify-addzone.db.original.signed";
 };
 
 zone "verify-axfr" {
-	type master;
+	type primary;
 	file "verify-axfr.db.signed";
 };
 
 zone "verify-csk" {
-	type master;
+	type primary;
 	file "verify-csk.db.signed";
 };
 
 zone "verify-ixfr" {
-	type master;
+	type primary;
 	file "verify-ixfr.db.signed";
 	ixfr-from-differences yes;
 	allow-transfer { 10.53.0.3; };
 };
 
 zone "verify-reconfig" {
-	type master;
+	type primary;
 	file "verify-reconfig.db.signed";
 };
 
 zone "verify-unsigned" {
-	type master;
+	type primary;
 	file "verify.db.in";
 };
 
 zone "verify-untrusted" {
-	type master;
+	type primary;
 	file "verify-untrusted.db.signed";
 };
diff --git a/bin/tests/system/mirror/tests.sh b/bin/tests/system/mirror/tests.sh
index 1dc6819037..a62767b079 100644
--- a/bin/tests/system/mirror/tests.sh
+++ b/bin/tests/system/mirror/tests.sh
@@ -14,12 +14,12 @@
 DIGOPTS="-p ${PORT} -b 10.53.0.1 +dnssec +time=2 +tries=1 +multi"
 RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
 
-# Wait until the transfer of the given zone to ns3 either completes successfully
-# or is aborted by a verification failure or a REFUSED response from the master.
-# Note that matching on any transfer status is deliberately avoided because some
-# checks performed by this test cause transfer attempts to end with the "IXFR
-# failed" status, which is followed by an AXFR retry and this test needs to
-# check what the result of the latter transfer attempt is.
+# Wait until the transfer of the given zone to ns3 either completes
+# successfully or is aborted by a verification failure or a REFUSED response
+# from the primary.  Note that matching on any transfer status is deliberately
+# avoided because some checks performed by this test cause transfer attempts to
+# end with the "IXFR failed" status, which is followed by an AXFR retry and
+# this test needs to check what the result of the latter transfer attempt is.
 wait_for_transfer() {
 	zone=$1
 	for i in 1 2 3 4 5 6 7 8 9 10; do
@@ -375,7 +375,7 @@ echo_i "checking that resolution succeeds with unavailable mirror zone data ($n)
 ret=0
 wait_for_transfer initially-unavailable
 # Query for a record in a zone that is set up to be mirrored, but
-# untransferrable from the configured master.  Resolution should still succeed.
+# untransferrable from the configured primary.  Resolution should still succeed.
 $DIG $DIGOPTS @10.53.0.3 foo.initially-unavailable. A > dig.out.ns3.test$n.1 2>&1 || ret=1
 # Check response code and flags in the answer.
 grep "NOERROR" dig.out.ns3.test$n.1 > /dev/null || ret=1
@@ -468,7 +468,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking that \"rndc reconfig\" properly handles a mirror -> slave zone type change ($n)"
+echo_i "checking that \"rndc reconfig\" properly handles a mirror -> secondary zone type change ($n)"
 ret=0
 # Sanity check before we start.
 $DIG $DIGOPTS @10.53.0.3 +norec verify-reconfig SOA > dig.out.ns3.test$n.1 2>&1 || ret=1
@@ -478,7 +478,7 @@ grep "flags:.* ad" dig.out.ns3.test$n.1 > /dev/null || ret=1
 # Reconfigure the zone so that it is no longer a mirror zone.
 # (NOTE: Keep the embedded newline in the sed function list below.)
 sed '/^zone "verify-reconfig" {$/,/^};$/ {
-	s/type mirror;/type slave;/
+	s/type mirror;/type secondary;/
 }' ns3/named.conf > ns3/named.conf.modified
 mv ns3/named.conf.modified ns3/named.conf
 nextpart ns3/named.run > /dev/null
@@ -495,7 +495,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo_i "checking that \"rndc reconfig\" properly handles a slave -> mirror zone type change ($n)"
+echo_i "checking that \"rndc reconfig\" properly handles a secondary -> mirror zone type change ($n)"
 ret=0
 # Put an incorrectly signed version of the zone in the zone file used by ns3.
 nextpart ns3/named.run > /dev/null
@@ -503,7 +503,7 @@ cat ns2/verify-reconfig.db.bad.signed > ns3/verify-reconfig.db.mirror
 # Reconfigure the zone so that it is a mirror zone again.
 # (NOTE: Keep the embedded newline in the sed function list below.)
 sed '/^zone "verify-reconfig" {$/,/^};$/ {
-	s/type slave;/type mirror;/
+	s/type secondary;/type mirror;/
 }' ns3/named.conf > ns3/named.conf.modified
 mv ns3/named.conf.modified ns3/named.conf
 rndc_reconfig ns3 10.53.0.3
@@ -525,7 +525,7 @@ grep "flags:.* aa" dig.out.ns3.test$n.1 > /dev/null && ret=1
 grep "flags:.* ad" dig.out.ns3.test$n.1 > /dev/null || ret=1
 # Mirror a zone which does not exist in the root zone.
 nextpart ns3/named.run > /dev/null
-$RNDCCMD 10.53.0.3 addzone verify-addzone '{ type mirror; masters { 10.53.0.2; }; };' > rndc.out.ns3.test$n 2>&1 || ret=1
+$RNDCCMD 10.53.0.3 addzone verify-addzone '{ type mirror; primaries { 10.53.0.2; }; };' > rndc.out.ns3.test$n 2>&1 || ret=1
 wait_for_transfer verify-addzone
 # Check whether the mirror zone was added and whether it behaves as expected.
 $DIG $DIGOPTS @10.53.0.3 +norec verify-addzone SOA > dig.out.ns3.test$n.2 2>&1 || ret=1
diff --git a/bin/tests/system/mkeys/ns1/named1.conf.in b/bin/tests/system/mkeys/ns1/named1.conf.in
index 807cd00e90..9033a2a226 100644
--- a/bin/tests/system/mkeys/ns1/named1.conf.in
+++ b/bin/tests/system/mkeys/ns1/named1.conf.in
@@ -40,7 +40,7 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 	allow-update { any; };
 	auto-dnssec maintain;
diff --git a/bin/tests/system/mkeys/ns1/named2.conf.in b/bin/tests/system/mkeys/ns1/named2.conf.in
index b9aae000e2..5b71d11e19 100644
--- a/bin/tests/system/mkeys/ns1/named2.conf.in
+++ b/bin/tests/system/mkeys/ns1/named2.conf.in
@@ -40,6 +40,6 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
diff --git a/bin/tests/system/mkeys/ns1/named3.conf.in b/bin/tests/system/mkeys/ns1/named3.conf.in
index 9f563ad6a3..8944c77171 100644
--- a/bin/tests/system/mkeys/ns1/named3.conf.in
+++ b/bin/tests/system/mkeys/ns1/named3.conf.in
@@ -34,6 +34,6 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
diff --git a/bin/tests/system/names/ns1/named.conf.in b/bin/tests/system/names/ns1/named.conf.in
index f885cc9a97..9b88e099e6 100644
--- a/bin/tests/system/names/ns1/named.conf.in
+++ b/bin/tests/system/names/ns1/named.conf.in
@@ -27,7 +27,7 @@ options {
 view compress {
 	match-clients { 10.53.0.1/32; };
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db";
 	};
 };
@@ -36,7 +36,7 @@ view nocompress {
 	match-clients { 10.53.0.2/32; };
 	message-compression no;
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db";
 	};
 };
diff --git a/bin/tests/system/notify/ns1/named.conf.in b/bin/tests/system/notify/ns1/named.conf.in
index b4a2fa8c05..6bbbe90ea1 100644
--- a/bin/tests/system/notify/ns1/named.conf.in
+++ b/bin/tests/system/notify/ns1/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/notify/ns2/named.conf.in b/bin/tests/system/notify/ns2/named.conf.in
index 464503d287..d29abe3204 100644
--- a/bin/tests/system/notify/ns2/named.conf.in
+++ b/bin/tests/system/notify/ns2/named.conf.in
@@ -37,34 +37,46 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	// Check that named can handle a empty also-notify.
 	also-notify { /* empty */ };
 };
 
+# use both 'primaries' and 'masters' to test that they
+# can work correctly together.
 primaries noport { 10.53.0.4; };
+masters x21 port @EXTRAPORT1@ { noport; };
 
-primaries x21 port @EXTRAPORT1@ { noport; };
+zone x1 {
+    type primary;
+	file "generic.db";
+	also-notify { 10.53.0.3; };
+    notify primary-only;
+};
+zone x2 {
+    type primary;
+	file "generic.db";
+	also-notify { 10.53.0.3; };
+    notify master-only; # test old syntax
+};
 
-zone x1 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x2 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x3 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x4 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x5 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x6 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x7 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x8 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x9 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x10 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x11 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x12 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x13 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x14 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x15 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x16 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x17 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x18 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x19 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x20 { type master; file "generic.db"; also-notify { 10.53.0.3; }; };
-zone x21 { type master; file "x21.db"; allow-update { any; }; also-notify { x21; }; };
+zone x3 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x4 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x5 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x6 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x7 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x8 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x9 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x10 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x11 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x12 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x13 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x14 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x15 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x16 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x17 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x18 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x19 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x20 { type primary; file "generic.db"; also-notify { 10.53.0.3; }; };
+zone x21 { type primary; file "x21.db"; allow-update { any; }; also-notify { x21; }; };
diff --git a/bin/tests/system/notify/ns3/named.conf.in b/bin/tests/system/notify/ns3/named.conf.in
index f0e47c116a..2f8e1eec19 100644
--- a/bin/tests/system/notify/ns3/named.conf.in
+++ b/bin/tests/system/notify/ns3/named.conf.in
@@ -27,7 +27,7 @@ zone "." {
 };
 
 zone "example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	file "example.bk";
 };
diff --git a/bin/tests/system/notify/ns4/named.conf.in b/bin/tests/system/notify/ns4/named.conf.in
index 72a737f97b..d1fdae8ea6 100644
--- a/bin/tests/system/notify/ns4/named.conf.in
+++ b/bin/tests/system/notify/ns4/named.conf.in
@@ -27,7 +27,7 @@ zone "." {
 };
 
 zone "x21" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2 port @PORT@; };
 	file "x21.bk";
 };
diff --git a/bin/tests/system/notify/ns5/named.conf.in b/bin/tests/system/notify/ns5/named.conf.in
index 7fe80f50e2..1ee8df4d3f 100644
--- a/bin/tests/system/notify/ns5/named.conf.in
+++ b/bin/tests/system/notify/ns5/named.conf.in
@@ -39,7 +39,7 @@ options {
 view "a" {
 	match-clients { key "a"; };
 	zone "x21" {
-		type master;
+		type primary;
 		also-notify { 10.53.0.5 key "b"; 10.53.0.5 key "c"; };
 		file "x21.db";
 		allow-update { any; };
@@ -49,7 +49,7 @@ view "a" {
 view "b" {
 	match-clients { key "b"; };
 	zone "x21" {
-		type slave;
+		type secondary;
 		primaries { 10.53.0.5 key "a"; };
 		file "x21.bk-b";
 		notify no;
@@ -59,7 +59,7 @@ view "b" {
 view "c" {
 	match-clients { key "c"; };
 	zone "x21" {
-		type slave;
+		type secondary;
 		primaries { 10.53.0.5 key "a"; };
 		file "x21.bk-c";
 		notify no;
diff --git a/bin/tests/system/nslookup/ns1/named.conf.in b/bin/tests/system/nslookup/ns1/named.conf.in
index 2be830f340..bc44f5788f 100644
--- a/bin/tests/system/nslookup/ns1/named.conf.in
+++ b/bin/tests/system/nslookup/ns1/named.conf.in
@@ -21,11 +21,11 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "example.net" {
-	type master;
+	type primary;
 	file "example.net.db";
 };
diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in
index 7ed8e14429..b20912e86c 100644
--- a/bin/tests/system/nsupdate/ns1/named.conf.in
+++ b/bin/tests/system/nsupdate/ns1/named.conf.in
@@ -40,7 +40,7 @@ key altkey {
 include "ddns.key";
 
 zone "example.nil" {
-	type master;
+	type primary;
 	file "example.db";
 	check-integrity no;
 	check-mx ignore;
@@ -51,7 +51,7 @@ zone "example.nil" {
 };
 
 zone "max-ttl.nil" {
-	type master;
+	type primary;
 	file "max-ttl.db";
 	max-zone-ttl 300;
 	check-integrity no;
@@ -60,7 +60,7 @@ zone "max-ttl.nil" {
 };
 
 zone "other.nil" {
-	type master;
+	type primary;
 	file "other.db";
 	check-integrity no;
 	check-mx warn;
@@ -75,7 +75,7 @@ primaries others {
 };
 
 zone "update.nil" {
-	type master;
+	type primary;
 	file "update.db";
 	check-integrity no;
 	check-mx fail;
@@ -85,7 +85,7 @@ zone "update.nil" {
 };
 
 zone "unixtime.nil" {
-	type master;
+	type primary;
 	file "unixtime.db";
 	check-integrity no;
 	allow-update { any; };
@@ -94,7 +94,7 @@ zone "unixtime.nil" {
 };
 
 zone "yyyymmddvv.nil" {
-	type master;
+	type primary;
 	file "yyyymmddvv.db";
 	check-integrity no;
 	allow-update { any; };
@@ -110,7 +110,7 @@ include "sha384.key";
 include "sha512.key";
 
 zone "keytests.nil" {
-	type master;
+	type primary;
 	file "keytests.db";
 	update-policy {
 	    grant md5-key name md5.keytests.nil. ANY;
@@ -123,19 +123,19 @@ zone "keytests.nil" {
 };
 
 zone "many.test" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "many.test.db";
 };
 
 zone "sample" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "sample.db";
 };
 
 zone "maxjournal.test" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "maxjournal.db";
 	max-journal-size default;
diff --git a/bin/tests/system/nsupdate/ns10/named.conf.in b/bin/tests/system/nsupdate/ns10/named.conf.in
index 44b207a077..457d96b4f8 100644
--- a/bin/tests/system/nsupdate/ns10/named.conf.in
+++ b/bin/tests/system/nsupdate/ns10/named.conf.in
@@ -33,13 +33,13 @@ controls {
 };
 
 zone "in-addr.arpa" {
-	type master;
+	type primary;
 	file "in-addr.db";
 	update-policy {	grant EXAMPLE.COM ms-subdomain . PTR; };
 };
 
 zone "example.com" {
-	type master;
+	type primary;
 	file "example.com.db";
 	update-policy {
 		grant EXAMPLE.COM ms-selfsub . ANY;
diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in
index 16a4a8583d..da6b3b4e30 100644
--- a/bin/tests/system/nsupdate/ns2/named.conf.in
+++ b/bin/tests/system/nsupdate/ns2/named.conf.in
@@ -40,7 +40,7 @@ view alternate {
 	match-clients { key altkey; };
 
 	zone "update.nil" {
-		type slave;
+		type secondary;
 		primaries { 10.53.0.1; };
 		file "update.alt.bk";
 		allow-transfer { any; };
@@ -51,21 +51,21 @@ view primary {
 	match-clients { any; };
 
 	zone "example.nil" {
-		type slave;
+		type secondary;
 		primaries { 10.53.0.1; };
 		file "example.bk";
 		allow-transfer { any; };
 	};
 
 	zone "update.nil" {
-		type slave;
+		type secondary;
 		primaries { 10.53.0.1; };
 		file "update.bk";
 		allow-transfer { any; };
 	};
 
 	zone "sample" {
-		type master;
+		type primary;
 		allow-update { any; };
 		file "sample.db";
 	};
diff --git a/bin/tests/system/nsupdate/ns3/named.conf.in b/bin/tests/system/nsupdate/ns3/named.conf.in
index c9ca9c2e9c..f658a19b1b 100644
--- a/bin/tests/system/nsupdate/ns3/named.conf.in
+++ b/bin/tests/system/nsupdate/ns3/named.conf.in
@@ -25,38 +25,38 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "example.db";
 };
 
 zone "nsec3param.test" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "nsec3param.test.db.signed";
 };
 
 zone "dnskey.test" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "dnskey.test.db.signed";
 };
 
 zone "many.test" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	allow-update-forwarding { any; };
 	file "many.test.bk";
 };
 
 zone "delegation.test" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "delegation.test.db.signed";
 };
 
 zone "too-big.test" {
-	type master;
+	type primary;
 	allow-update { any; };
 	max-records 3;
 	file "too-big.test.db";
diff --git a/bin/tests/system/nsupdate/ns5/named.conf.in b/bin/tests/system/nsupdate/ns5/named.conf.in
index 2ffacb1e65..78411898c7 100644
--- a/bin/tests/system/nsupdate/ns5/named.conf.in
+++ b/bin/tests/system/nsupdate/ns5/named.conf.in
@@ -32,7 +32,7 @@ controls {
 };
 
 zone "local.nil" {
-	type master;
+	type primary;
 	file "local.db";
 	update-policy local;
 };
diff --git a/bin/tests/system/nsupdate/ns6/named.conf.in b/bin/tests/system/nsupdate/ns6/named.conf.in
index b4ec11a326..adb2627b86 100644
--- a/bin/tests/system/nsupdate/ns6/named.conf.in
+++ b/bin/tests/system/nsupdate/ns6/named.conf.in
@@ -32,7 +32,7 @@ controls {
 };
 
 zone "in-addr.arpa" {
-	type master;
+	type primary;
 	file "in-addr.db";
 	update-policy {	grant * tcp-self . PTR(1) ANY(2) A; };
 };
diff --git a/bin/tests/system/nsupdate/ns7/named.conf.in b/bin/tests/system/nsupdate/ns7/named.conf.in
index f0ef6d3655..49a3e3b08b 100644
--- a/bin/tests/system/nsupdate/ns7/named.conf.in
+++ b/bin/tests/system/nsupdate/ns7/named.conf.in
@@ -33,13 +33,13 @@ controls {
 };
 
 zone "in-addr.arpa" {
-	type master;
+	type primary;
 	file "in-addr.db";
 	update-policy {	grant EXAMPLE.COM krb5-subdomain . PTR; };
 };
 
 zone "example.com" {
-	type master;
+	type primary;
 	file "example.com.db";
 	update-policy {
 		grant EXAMPLE.COM krb5-self . ANY;
diff --git a/bin/tests/system/nsupdate/ns8/named.conf.in b/bin/tests/system/nsupdate/ns8/named.conf.in
index 56195cd2d4..92792db680 100644
--- a/bin/tests/system/nsupdate/ns8/named.conf.in
+++ b/bin/tests/system/nsupdate/ns8/named.conf.in
@@ -33,13 +33,13 @@ controls {
 };
 
 zone "in-addr.arpa" {
-	type master;
+	type primary;
 	file "in-addr.db";
 	update-policy {	grant EXAMPLE.COM krb5-subdomain . PTR; };
 };
 
 zone "example.com" {
-	type master;
+	type primary;
 	file "example.com.db";
 	update-policy {
 		grant EXAMPLE.COM krb5-selfsub . ANY;
diff --git a/bin/tests/system/nsupdate/ns9/named.conf.in b/bin/tests/system/nsupdate/ns9/named.conf.in
index 1b41cc6421..88c0d7a709 100644
--- a/bin/tests/system/nsupdate/ns9/named.conf.in
+++ b/bin/tests/system/nsupdate/ns9/named.conf.in
@@ -33,13 +33,13 @@ controls {
 };
 
 zone "in-addr.arpa" {
-	type master;
+	type primary;
 	file "in-addr.db";
 	update-policy {	grant EXAMPLE.COM ms-subdomain . PTR; };
 };
 
 zone "example.com" {
-	type master;
+	type primary;
 	file "example.com.db";
 	update-policy {
 		grant EXAMPLE.COM ms-self . ANY;
diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index 055161b4b7..8afa71cd90 100755
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -362,7 +362,7 @@ digcomp dig.out.ns1 dig.out.ns1.after || ret=1
 echo_i "begin RT #482 regression test"
 
 ret=0
-echo_i "update master"
+echo_i "update primary"
 $NSUPDATE -k ns1/ddns.key <<END > /dev/null || ret=1
 server 10.53.0.1 ${PORT}
 update add updated2.example.nil. 600 A 10.10.10.2
@@ -375,17 +375,17 @@ END
 sleep 5
 
 if [ ! "$CYGWIN" ]; then
-    echo_i "SIGHUP slave"
+    echo_i "SIGHUP secondary"
     $KILL -HUP `cat ns2/named.pid`
 else
-    echo_i "reload slave"
+    echo_i "reload secondary"
     rndc_reload ns2 10.53.0.2
 fi
 
 sleep 5
 
 ret=0
-echo_i "update master again"
+echo_i "update primary again"
 $NSUPDATE -k ns1/ddns.key <<END > /dev/null || ret=1
 server 10.53.0.1 ${PORT}
 update add updated3.example.nil. 600 A 10.10.10.3
@@ -398,10 +398,10 @@ END
 sleep 5
 
 if [ ! "$CYGWIN" ]; then
-    echo_i "SIGHUP slave again"
+    echo_i "SIGHUP secondary again"
     $KILL -HUP `cat ns2/named.pid`
 else
-    echo_i "reload slave again"
+    echo_i "reload secondary again"
     rndc_reload ns2 10.53.0.2
 fi
 
@@ -508,7 +508,7 @@ if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $ret + $status`; fi
 
 
 ret=0
-echo_i "testing that rndc stop updates the master file"
+echo_i "testing that rndc stop updates the file"
 $NSUPDATE -k ns1/ddns.key <<END > /dev/null || ret=1
 server 10.53.0.1 ${PORT}
 update add updated4.example.nil. 600 A 10.10.10.3
@@ -519,7 +519,7 @@ $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} nsupdate ns1
 sleep 3
 # Removing the journal file and restarting the server means
 # that the data served by the new server process are exactly
-# those dumped to the master file by "rndc stop".
+# those dumped to the file by "rndc stop".
 rm -f ns1/*jnl
 start_server --noclean --restart --port ${PORT} nsupdate ns1
 for try in 0 1 2 3 4 5 6 7 8 9; do
@@ -924,7 +924,7 @@ grep "records in zone (4) exceeds max-records (3)" ns3/named.run > /dev/null ||
 
 n=`expr $n + 1`
 ret=0
-echo_i "check whether valid addresses are used for master failover ($n)"
+echo_i "check whether valid addresses are used for primary failover ($n)"
 $NSUPDATE -t 1 <<END > nsupdate.out-$n 2>&1 && ret=1
 server 10.53.0.4 ${PORT}
 zone unreachable.
diff --git a/bin/tests/system/padding/ns1/named.conf.in b/bin/tests/system/padding/ns1/named.conf.in
index 828bc40b7b..88e0781ee8 100644
--- a/bin/tests/system/padding/ns1/named.conf.in
+++ b/bin/tests/system/padding/ns1/named.conf.in
@@ -31,6 +31,6 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/padding/ns2/named.conf.in b/bin/tests/system/padding/ns2/named.conf.in
index 4263cafd84..89fa953651 100644
--- a/bin/tests/system/padding/ns2/named.conf.in
+++ b/bin/tests/system/padding/ns2/named.conf.in
@@ -38,6 +38,6 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/pending/ns1/named.conf.in b/bin/tests/system/pending/ns1/named.conf.in
index e36b0b1135..09e5d85d0b 100644
--- a/bin/tests/system/pending/ns1/named.conf.in
+++ b/bin/tests/system/pending/ns1/named.conf.in
@@ -23,6 +23,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
diff --git a/bin/tests/system/pending/ns2/named.conf.in b/bin/tests/system/pending/ns2/named.conf.in
index ef066e3289..1930ae3387 100644
--- a/bin/tests/system/pending/ns2/named.conf.in
+++ b/bin/tests/system/pending/ns2/named.conf.in
@@ -32,18 +32,18 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db.signed";
 };
 
 zone "example.com" {
-	type master;
+	type primary;
 	file "example.com.db.signed";
 	allow-update { 10.53.0.0/16; };
 };
 
 zone "good" {
-	type master;
+	type primary;
 	file "forgery.db";
 	allow-query { any; };
 };
diff --git a/bin/tests/system/pending/ns3/named.conf.in b/bin/tests/system/pending/ns3/named.conf.in
index a701e8d2e3..6385aa10a0 100644
--- a/bin/tests/system/pending/ns3/named.conf.in
+++ b/bin/tests/system/pending/ns3/named.conf.in
@@ -32,11 +32,11 @@ zone "." {
 };
 
 zone "mail.example" {
-	type master;
+	type primary;
 	file "mail.example.db";
 };
 
 zone "hostile" {
-	type master;
+	type primary;
 	file "hostile.db";
 };
diff --git a/bin/tests/system/pipelined/ns1/named.conf.in b/bin/tests/system/pipelined/ns1/named.conf.in
index 1a6ec06b4d..bf8ed04fc1 100644
--- a/bin/tests/system/pipelined/ns1/named.conf.in
+++ b/bin/tests/system/pipelined/ns1/named.conf.in
@@ -32,6 +32,6 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/pipelined/ns2/named.conf.in b/bin/tests/system/pipelined/ns2/named.conf.in
index 291e66ab06..9727ca9052 100644
--- a/bin/tests/system/pipelined/ns2/named.conf.in
+++ b/bin/tests/system/pipelined/ns2/named.conf.in
@@ -37,7 +37,7 @@ zone "." {
 };
 
 zone "examplea" {
-	type master;
+	type primary;
 	file "examplea.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/pipelined/ns3/named.conf.in b/bin/tests/system/pipelined/ns3/named.conf.in
index 25614d865f..0bee9dc576 100644
--- a/bin/tests/system/pipelined/ns3/named.conf.in
+++ b/bin/tests/system/pipelined/ns3/named.conf.in
@@ -37,7 +37,7 @@ zone "." {
 };
 
 zone "exampleb" {
-	type master;
+	type primary;
 	file "exampleb.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh
index 2787ad1a80..bc85fc75d0 100644
--- a/bin/tests/system/pkcs11/setup.sh
+++ b/bin/tests/system/pkcs11/setup.sh
@@ -80,7 +80,7 @@ for algbits in rsasha256:2048 rsasha512:2048 ecdsap256sha256:256 ecdsap384sha384
 
 	cat >> ns1/named.conf <<EOF
 zone "$alg.example." {
-	type master;
+	type primary;
 	file "$alg.example.db.signed";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/qmin/ns1/named.conf.in b/bin/tests/system/qmin/ns1/named.conf.in
index d1ab47dbdb..13e10aca48 100644
--- a/bin/tests/system/qmin/ns1/named.conf.in
+++ b/bin/tests/system/qmin/ns1/named.conf.in
@@ -25,6 +25,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/reclimit/ns1/named.conf.in b/bin/tests/system/reclimit/ns1/named.conf.in
index 00fa44b3ba..3eb07b7fd3 100644
--- a/bin/tests/system/reclimit/ns1/named.conf.in
+++ b/bin/tests/system/reclimit/ns1/named.conf.in
@@ -22,4 +22,4 @@ options {
 	dnssec-validation no;
 };
 
-zone "." { type master; file "root.db"; };
+zone "." { type primary; file "root.db"; };
diff --git a/bin/tests/system/redirect/conf/good3.conf b/bin/tests/system/redirect/conf/good3.conf
index 3d91ba3b0a..bd70d6dbe1 100644
--- a/bin/tests/system/redirect/conf/good3.conf
+++ b/bin/tests/system/redirect/conf/good3.conf
@@ -10,9 +10,9 @@
  */
 
 zone "." {
-	type slave;
-	file "slave.db";
-	masters { 1.2.3.4; };
+	type secondary;
+	file "sec.db";
+	primaries { 1.2.3.4; };
 };
 
 zone "." {
diff --git a/bin/tests/system/redirect/ns1/named.conf.in b/bin/tests/system/redirect/ns1/named.conf.in
index 8a61776b07..6afaa6bb97 100644
--- a/bin/tests/system/redirect/ns1/named.conf.in
+++ b/bin/tests/system/redirect/ns1/named.conf.in
@@ -27,22 +27,22 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "signed" {
-	type master;
+	type primary;
 	file "signed.db.signed";
 };
 
 zone "nsec3" {
-	type master;
+	type primary;
 	file "nsec3.db.signed";
 };
 
diff --git a/bin/tests/system/redirect/ns2/named.conf.in b/bin/tests/system/redirect/ns2/named.conf.in
index 0ab3bab559..e2d74e7ef0 100644
--- a/bin/tests/system/redirect/ns2/named.conf.in
+++ b/bin/tests/system/redirect/ns2/named.conf.in
@@ -50,6 +50,6 @@ zone "." {
 };
 
 zone "example.nil" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/redirect/ns3/named.conf.in b/bin/tests/system/redirect/ns3/named.conf.in
index feab73cb12..53e6a7f67c 100644
--- a/bin/tests/system/redirect/ns3/named.conf.in
+++ b/bin/tests/system/redirect/ns3/named.conf.in
@@ -25,27 +25,27 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "signed" {
-	type master;
+	type primary;
 	file "signed.db.signed";
 };
 
 zone "nsec3" {
-	type master;
+	type primary;
 	file "nsec3.db.signed";
 };
 
 zone "redirect" {
-	type master;
+	type primary;
 	file "redirect.db";
 };
 
diff --git a/bin/tests/system/redirect/ns4/named.conf.in b/bin/tests/system/redirect/ns4/named.conf.in
index c6003441fa..104619fb61 100644
--- a/bin/tests/system/redirect/ns4/named.conf.in
+++ b/bin/tests/system/redirect/ns4/named.conf.in
@@ -44,6 +44,6 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/redirect/ns5/named.conf.in b/bin/tests/system/redirect/ns5/named.conf.in
index e06deb02a9..6987f7e656 100644
--- a/bin/tests/system/redirect/ns5/named.conf.in
+++ b/bin/tests/system/redirect/ns5/named.conf.in
@@ -19,12 +19,12 @@ options {
 };
 
 zone "." {
-        type master;
+        type primary;
         file "root.db.signed";
 };
 
 // An unsigned zone that ns6 has a delegation for.
 zone "unsigned." {
-        type master;
+        type primary;
         file "unsigned.db";
 };
diff --git a/bin/tests/system/redirect/ns6/named.conf.in b/bin/tests/system/redirect/ns6/named.conf.in
index bca355c3ea..71aa56df68 100644
--- a/bin/tests/system/redirect/ns6/named.conf.in
+++ b/bin/tests/system/redirect/ns6/named.conf.in
@@ -19,12 +19,12 @@ options {
 };
 
 zone "." {
-        type master;
+        type primary;
         file "root.db";
 };
 
 // A signed zone that ns5 has a delegation for.
 zone "signed." {
-        type master;
+        type primary;
         file "signed.db.signed";
 };
diff --git a/bin/tests/system/resolver/ns1/named.conf.in b/bin/tests/system/resolver/ns1/named.conf.in
index b26a156601..717caaeeca 100644
--- a/bin/tests/system/resolver/ns1/named.conf.in
+++ b/bin/tests/system/resolver/ns1/named.conf.in
@@ -47,7 +47,7 @@ server fd92:7065:b8e:ffff::1000 {
  */
 view "class" chaos {
 	zone "chaostest" CHAOS {
-                type master;
+                type primary;
                 file "chaostest.db";
         };
 };
diff --git a/bin/tests/system/resolver/ns4/named.conf.in b/bin/tests/system/resolver/ns4/named.conf.in
index 7095346ed2..ec74ec8d6a 100644
--- a/bin/tests/system/resolver/ns4/named.conf.in
+++ b/bin/tests/system/resolver/ns4/named.conf.in
@@ -26,32 +26,32 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "moves" {
-	type master;
+	type primary;
 	file "moves.db";
 };
 
 zone "child.server" {
-	type master;
+	type primary;
 	file "child.server.db";
 };
 
 zone "tld" {
-	type master;
+	type primary;
 	file "tld.db";
 };
 
 zone "broken" {
-	type master;
+	type primary;
 	file "broken.db";
 };
 
 zone "sourcens" {
-    type master;
+    type primary;
     file "sourcens.db";
 };
 
diff --git a/bin/tests/system/resolver/ns5/named.conf.in b/bin/tests/system/resolver/ns5/named.conf.in
index b8fdd5e508..a3e59023d7 100644
--- a/bin/tests/system/resolver/ns5/named.conf.in
+++ b/bin/tests/system/resolver/ns5/named.conf.in
@@ -35,12 +35,12 @@ zone "." {
 };
 
 zone "moves" {
-	type master;
+	type primary;
 	file "moves.db";
 };
 
 zone "child.server" {
-	type master;
+	type primary;
 	file "child.server.db";
 };
 
diff --git a/bin/tests/system/resolver/ns6/named.conf.in b/bin/tests/system/resolver/ns6/named.conf.in
index 3046e62965..1726d5fa5b 100644
--- a/bin/tests/system/resolver/ns6/named.conf.in
+++ b/bin/tests/system/resolver/ns6/named.conf.in
@@ -31,51 +31,51 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "example.net" {
-	type master;
+	type primary;
 	file "example.net.db.signed";
 	allow-update { any; };
 };
 
 zone "ds.example.net" {
-	type master;
+	type primary;
 	file "ds.example.net.db.signed";
 	allow-update { any; };
 };
 
 zone "to-be-removed.tld" {
-	type master;
+	type primary;
 	file "to-be-removed.tld.db";
 	allow-update { any; };
 };
 
 zone "broken" {
-	type master;
+	type primary;
 	file "broken.db";
 	allow-update { any; };
 };
 
 zone "no-edns-version.tld" {
-	type master;
+	type primary;
 	file "no-edns-version.tld.db";
 };
 
 zone "delegation-only" {
-	type master;
+	type primary;
 	file "delegation-only.db";
 };
 
 zone "fetch.tld" {
-	type master;
+	type primary;
 	file "fetch.tld.db";
 };
 
 zone "targetns" {
-	type master;
+	type primary;
 	file "targetns.db";
 };
 
diff --git a/bin/tests/system/resolver/ns7/named1.conf.in b/bin/tests/system/resolver/ns7/named1.conf.in
index 787705984d..47ce301e86 100644
--- a/bin/tests/system/resolver/ns7/named1.conf.in
+++ b/bin/tests/system/resolver/ns7/named1.conf.in
@@ -46,17 +46,17 @@ zone "." {
 };
 
 zone "server" {
-	type master;
+	type primary;
 	file "server.db";
 	allow-update { any; };
 };
 
 zone "edns-version.tld" {
-	type master;
+	type primary;
 	file "edns-version.tld.db";
 };
 
 zone "all-cnames" {
-	type master;
+	type primary;
 	file "all-cnames.db";
 };
diff --git a/bin/tests/system/resolver/ns7/named2.conf.in b/bin/tests/system/resolver/ns7/named2.conf.in
index 787705984d..47ce301e86 100644
--- a/bin/tests/system/resolver/ns7/named2.conf.in
+++ b/bin/tests/system/resolver/ns7/named2.conf.in
@@ -46,17 +46,17 @@ zone "." {
 };
 
 zone "server" {
-	type master;
+	type primary;
 	file "server.db";
 	allow-update { any; };
 };
 
 zone "edns-version.tld" {
-	type master;
+	type primary;
 	file "edns-version.tld.db";
 };
 
 zone "all-cnames" {
-	type master;
+	type primary;
 	file "all-cnames.db";
 };
diff --git a/bin/tests/system/rndc/ns2/named.conf.in b/bin/tests/system/rndc/ns2/named.conf.in
index e4dfe3fddb..6afd5fec13 100644
--- a/bin/tests/system/rndc/ns2/named.conf.in
+++ b/bin/tests/system/rndc/ns2/named.conf.in
@@ -39,24 +39,24 @@ zone "." {
 };
 
 zone "nil" {
-	type master;
+	type primary;
 	update-policy local;
 	file "nil.db";
 	ixfr-from-differences yes;
 };
 
 zone "other" {
-	type master;
+	type primary;
 	update-policy local;
 	file "other.db";
 };
 
 zone "static" {
-	type master;
+	type primary;
 	file "static.db";
 };
 
 zone "incl" {
-	type master;
+	type primary;
 	file "incl.db";
 };
diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index 8b1534b623..d3fc9bef30 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -587,7 +587,7 @@ echo_i "test 'rndc reconfig' with loading of a large zone ($n)"
 ret=0
 cur=`awk 'BEGIN {l=0} /^/ {l++} END { print l }' ns6/named.run`
 cp ns6/named.conf ns6/named.conf.save
-echo "zone \"huge.zone\" { type master; file \"huge.zone.db\"; };" >> ns6/named.conf
+echo "zone \"huge.zone\" { type primary; file \"huge.zone.db\"; };" >> ns6/named.conf
 echo_i "reloading config"
 $RNDCCMD 10.53.0.6 reconfig > rndc.out.1.test$n 2>&1 || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
diff --git a/bin/tests/system/rootkeysentinel/ns1/named.conf.in b/bin/tests/system/rootkeysentinel/ns1/named.conf.in
index 1cdab00a4b..b17c4ca6a5 100644
--- a/bin/tests/system/rootkeysentinel/ns1/named.conf.in
+++ b/bin/tests/system/rootkeysentinel/ns1/named.conf.in
@@ -23,7 +23,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
 
diff --git a/bin/tests/system/rootkeysentinel/ns2/named.conf.in b/bin/tests/system/rootkeysentinel/ns2/named.conf.in
index 4ab4edaec5..f0b44e938c 100644
--- a/bin/tests/system/rootkeysentinel/ns2/named.conf.in
+++ b/bin/tests/system/rootkeysentinel/ns2/named.conf.in
@@ -23,7 +23,7 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db.signed";
 };
 
diff --git a/bin/tests/system/rpz/dnsrpzd.conf.in b/bin/tests/system/rpz/dnsrpzd.conf.in
index bc45808ebb..667f782d43 100644
--- a/bin/tests/system/rpz/dnsrpzd.conf.in
+++ b/bin/tests/system/rpz/dnsrpzd.conf.in
@@ -20,41 +20,41 @@ port @EXTRAPORT1@;
 listen-on port @EXTRAPORT1@ { 10.53.0.3; };
 allow-notify { 10.53.0.0/24; };
 
-zone "bl0"		{type master; file "../ns5/bl.db"; };
-zone "bl1"		{type master; file "../ns5/bl.db"; };
-zone "bl2"		{type master; file "../ns5/bl.db"; };
-zone "bl3"		{type master; file "../ns5/bl.db"; };
-zone "bl4"		{type master; file "../ns5/bl.db"; };
-zone "bl5"		{type master; file "../ns5/bl.db"; };
-zone "bl6"		{type master; file "../ns5/bl.db"; };
-zone "bl7"		{type master; file "../ns5/bl.db"; };
-zone "bl8"		{type master; file "../ns5/bl.db"; };
-zone "bl9"		{type master; file "../ns5/bl.db"; };
-zone "bl10"		{type master; file "../ns5/bl.db"; };
-zone "bl11"		{type master; file "../ns5/bl.db"; };
-zone "bl12"		{type master; file "../ns5/bl.db"; };
-zone "bl13"		{type master; file "../ns5/bl.db"; };
-zone "bl14"		{type master; file "../ns5/bl.db"; };
-zone "bl15"		{type master; file "../ns5/bl.db"; };
-zone "bl16"		{type master; file "../ns5/bl.db"; };
-zone "bl17"		{type master; file "../ns5/bl.db"; };
-zone "bl18"		{type master; file "../ns5/bl.db"; };
-zone "bl19"		{type master; file "../ns5/bl.db"; };
+zone "bl0"		{type primary; file "../ns5/bl.db"; };
+zone "bl1"		{type primary; file "../ns5/bl.db"; };
+zone "bl2"		{type primary; file "../ns5/bl.db"; };
+zone "bl3"		{type primary; file "../ns5/bl.db"; };
+zone "bl4"		{type primary; file "../ns5/bl.db"; };
+zone "bl5"		{type primary; file "../ns5/bl.db"; };
+zone "bl6"		{type primary; file "../ns5/bl.db"; };
+zone "bl7"		{type primary; file "../ns5/bl.db"; };
+zone "bl8"		{type primary; file "../ns5/bl.db"; };
+zone "bl9"		{type primary; file "../ns5/bl.db"; };
+zone "bl10"		{type primary; file "../ns5/bl.db"; };
+zone "bl11"		{type primary; file "../ns5/bl.db"; };
+zone "bl12"		{type primary; file "../ns5/bl.db"; };
+zone "bl13"		{type primary; file "../ns5/bl.db"; };
+zone "bl14"		{type primary; file "../ns5/bl.db"; };
+zone "bl15"		{type primary; file "../ns5/bl.db"; };
+zone "bl16"		{type primary; file "../ns5/bl.db"; };
+zone "bl17"		{type primary; file "../ns5/bl.db"; };
+zone "bl18"		{type primary; file "../ns5/bl.db"; };
+zone "bl19"		{type primary; file "../ns5/bl.db"; };
 
-zone "bl"		{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-2"		{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-given"		{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-passthru"	{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-no-op"		{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-disabled"	{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-nodata"	{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-nxdomain"	{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-cname"		{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-wildcname"	{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-garden"	{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-drop"		{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl-tcp-only"	{type slave; primaries port @PORT@ { 10.53.0.3; }; };
-zone "bl.tld2"		{type slave; primaries port @PORT@ { 10.53.0.3; }; };
+zone "bl"		{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-2"		{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-given"		{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-passthru"	{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-no-op"		{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-disabled"	{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-nodata"	{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-nxdomain"	{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-cname"		{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-wildcname"	{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-garden"	{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-drop"		{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl-tcp-only"	{type slave; masters port @PORT@ { 10.53.0.3; }; };
+zone "bl.tld2"		{type slave; masters port @PORT@ { 10.53.0.3; }; };
 
-zone "policy1"		{type slave; primaries port @PORT@ { 10.53.0.6; }; };
-zone "policy2"		{type slave; primaries port @PORT@ { 10.53.0.7; }; };
+zone "policy1"		{type slave; masters port @PORT@ { 10.53.0.6; }; };
+zone "policy2"		{type slave; masters port @PORT@ { 10.53.0.7; }; };
diff --git a/bin/tests/system/rpz/ns1/named.conf.in b/bin/tests/system/rpz/ns1/named.conf.in
index 59528f8819..32bf1ecdd5 100644
--- a/bin/tests/system/rpz/ns1/named.conf.in
+++ b/bin/tests/system/rpz/ns1/named.conf.in
@@ -31,4 +31,4 @@ controls {
 	inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
-zone "." {type master; file "root.db";};
+zone "." {type primary; file "root.db";};
diff --git a/bin/tests/system/rpz/ns2/bl.tld2.db.in b/bin/tests/system/rpz/ns2/bl.tld2.db.in
index 98b9e578e3..b68a9f1b6f 100644
--- a/bin/tests/system/rpz/ns2/bl.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/bl.tld2.db.in
@@ -7,7 +7,7 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; master for slave RPZ zone
+; primary for secondary RPZ zone
 
 $TTL	3600
 @		SOA	rpz.tld2.  hostmaster.ns.tld2. ( 1 3600 1200 604800 60 )
diff --git a/bin/tests/system/rpz/ns2/blv2.tld2.db.in b/bin/tests/system/rpz/ns2/blv2.tld2.db.in
index e30db4b200..9c41e3ce98 100644
--- a/bin/tests/system/rpz/ns2/blv2.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/blv2.tld2.db.in
@@ -7,7 +7,7 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; master for slave RPZ zone
+; primary for secondary RPZ zone
 
 $TTL	3600
 @		SOA	rpz.tld2.  hostmaster.ns.tld2. ( 2 3600 1200 604800 60 )
diff --git a/bin/tests/system/rpz/ns2/blv3.tld2.db.in b/bin/tests/system/rpz/ns2/blv3.tld2.db.in
index 8a3d547fdd..e61653ec32 100644
--- a/bin/tests/system/rpz/ns2/blv3.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/blv3.tld2.db.in
@@ -7,7 +7,7 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; master for slave RPZ zone
+; primary for secondary RPZ zone
 
 $TTL	3600
 @		SOA	rpz.tld2.  hostmaster.ns.tld2. ( 3 3600 1200 604800 60 )
diff --git a/bin/tests/system/rpz/ns2/named.conf.in b/bin/tests/system/rpz/ns2/named.conf.in
index 15226401e9..8148b8ac25 100644
--- a/bin/tests/system/rpz/ns2/named.conf.in
+++ b/bin/tests/system/rpz/ns2/named.conf.in
@@ -35,15 +35,15 @@ controls {
 include "../trusted.conf";
 zone "." { type hint; file "hints"; };
 
-zone "tld2."		    {type master; file "tld2.db";};
-zone "sub1.tld2."	    {type master; file "tld2.db";};
-zone "subsub.sub1.tld2."    {type master; file "tld2.db";};
-zone "sub2.tld2."	    {type master; file "tld2.db";};
-zone "subsub.sub2.tld2."    {type master; file "tld2.db";};
-zone "sub3.tld2."	    {type master; file "tld2.db";};
-zone "subsub.sub3.tld2."    {type master; file "tld2.db";};
+zone "tld2."		    {type primary; file "tld2.db";};
+zone "sub1.tld2."	    {type primary; file "tld2.db";};
+zone "subsub.sub1.tld2."    {type primary; file "tld2.db";};
+zone "sub2.tld2."	    {type primary; file "tld2.db";};
+zone "subsub.sub2.tld2."    {type primary; file "tld2.db";};
+zone "sub3.tld2."	    {type primary; file "tld2.db";};
+zone "subsub.sub3.tld2."    {type primary; file "tld2.db";};
 
-zone "tld2s."		    {type master; file "tld2s.db";};
+zone "tld2s."		    {type primary; file "tld2s.db";};
 
-zone "bl.tld2."		    {type master; file "bl.tld2.db";
+zone "bl.tld2."		    {type primary; file "bl.tld2.db";
 				notify yes; notify-delay 0;};
diff --git a/bin/tests/system/rpz/ns3/named.conf.in b/bin/tests/system/rpz/ns3/named.conf.in
index 2c6c4a0335..f9d1b54980 100644
--- a/bin/tests/system/rpz/ns3/named.conf.in
+++ b/bin/tests/system/rpz/ns3/named.conf.in
@@ -75,41 +75,41 @@ controls {
 
 zone "." { type hint; file "hints"; };
 
-zone "bl."		{type master; file "bl.db";
+zone "bl."		{type primary; file "bl.db";
 				allow-update {any;};};
-zone "bl-2."		{type master; file "bl-2.db";
+zone "bl-2."		{type primary; file "bl-2.db";
 				allow-update {any;};};
-zone "bl-given."	{type master; file "bl-given.db";
+zone "bl-given."	{type primary; file "bl-given.db";
 				allow-update {any;};};
-zone "bl-passthru."	{type master; file "bl-passthru.db";
+zone "bl-passthru."	{type primary; file "bl-passthru.db";
 				allow-update {any;};};
-zone "bl-no-op."	{type master; file "bl-no-op.db";
+zone "bl-no-op."	{type primary; file "bl-no-op.db";
 				allow-update {any;};};
-zone "bl-disabled."	{type master; file "bl-disabled.db";
+zone "bl-disabled."	{type primary; file "bl-disabled.db";
 				allow-update {any;};};
-zone "bl-nodata."	{type master; file "bl-nodata.db";
+zone "bl-nodata."	{type primary; file "bl-nodata.db";
 				allow-update {any;};};
-zone "bl-nxdomain."	{type master; file "bl-nxdomain.db";
+zone "bl-nxdomain."	{type primary; file "bl-nxdomain.db";
 				allow-update {any;};};
-zone "bl-cname."	{type master; file "bl-cname.db";
+zone "bl-cname."	{type primary; file "bl-cname.db";
 				allow-update {any;};};
-zone "bl-wildcname."	{type master; file "bl-wildcname.db";
+zone "bl-wildcname."	{type primary; file "bl-wildcname.db";
 				allow-update {any;};};
-zone "bl-garden."	{type master; file "bl-garden.db";
+zone "bl-garden."	{type primary; file "bl-garden.db";
 				allow-update {any;};};
-zone "bl-drop."		{type master; file "bl-drop.db";
+zone "bl-drop."		{type primary; file "bl-drop.db";
 				allow-update {any;};};
-zone "bl-tcp-only."	{type master; file "bl-tcp-only.db";
+zone "bl-tcp-only."	{type primary; file "bl-tcp-only.db";
 				allow-update {any;};};
 
-zone "bl.tld2."		{type slave; file "bl.tld2.db"; primaries {10.53.0.2;};
+zone "bl.tld2."		{type secondary; file "bl.tld2.db"; primaries {10.53.0.2;};
 				request-ixfr no; masterfile-format text;};
 
-zone "crash1.tld2"	{type master; file "crash1"; notify no;};
-zone "crash2.tld3."	{type master; file "crash2"; notify no;};
+zone "crash1.tld2"	{type primary; file "crash1"; notify no;};
+zone "crash2.tld3."	{type primary; file "crash2"; notify no;};
 
 zone "manual-update-rpz." {
-	type master;
+	type primary;
 	file "manual-update-rpz.db";
 	notify no;
 };
diff --git a/bin/tests/system/rpz/ns4/named.conf.in b/bin/tests/system/rpz/ns4/named.conf.in
index 6189b627fb..62cac72ba0 100644
--- a/bin/tests/system/rpz/ns4/named.conf.in
+++ b/bin/tests/system/rpz/ns4/named.conf.in
@@ -36,8 +36,8 @@ controls {
 include "../trusted.conf";
 zone "." { type hint; file "hints"; };
 
-zone "tld4."		    {type master; file "tld4.db";};
-zone "sub1.tld4."	    {type master; file "tld4.db";};
-zone "subsub.sub1.tld4."    {type master; file "tld4.db";};
-zone "sub2.tld4."	    {type master; file "tld4.db";};
-zone "subsub.sub2.tld4."    {type master; file "tld4.db";};
+zone "tld4."		    {type primary; file "tld4.db";};
+zone "sub1.tld4."	    {type primary; file "tld4.db";};
+zone "subsub.sub1.tld4."    {type primary; file "tld4.db";};
+zone "sub2.tld4."	    {type primary; file "tld4.db";};
+zone "subsub.sub2.tld4."    {type primary; file "tld4.db";};
diff --git a/bin/tests/system/rpz/ns5/expire.conf.in b/bin/tests/system/rpz/ns5/expire.conf.in
index 305d46e27c..f0a1b3c68e 100644
--- a/bin/tests/system/rpz/ns5/expire.conf.in
+++ b/bin/tests/system/rpz/ns5/expire.conf.in
@@ -10,7 +10,7 @@
  */
 
 zone "fast-expire." {
-	type master;
+	type primary;
 	file "fast-expire.db";
 	allow-transfer { any; };
 	notify no;
diff --git a/bin/tests/system/rpz/ns5/named.conf.in b/bin/tests/system/rpz/ns5/named.conf.in
index 5bc624acf1..a72dc14fe8 100644
--- a/bin/tests/system/rpz/ns5/named.conf.in
+++ b/bin/tests/system/rpz/ns5/named.conf.in
@@ -48,32 +48,32 @@ controls {
 include "../trusted.conf";
 zone "."		{type hint; file "hints"; };
 
-zone "tld5."		{type master; file "tld5.db"; };
-zone "example.tld5."	{type master; file "example.db"; };
+zone "tld5."		{type primary; file "tld5.db"; };
+zone "example.tld5."	{type primary; file "example.db"; };
 
-zone "bl0."		{type master; file "bl.db"; };
-zone "bl1."		{type master; file "bl.db"; };
-zone "bl2."		{type master; file "bl.db"; };
-zone "bl3."		{type master; file "bl.db"; };
-zone "bl4."		{type master; file "bl.db"; };
-zone "bl5."		{type master; file "bl.db"; };
-zone "bl6."		{type master; file "bl.db"; };
-zone "bl7."		{type master; file "bl.db"; };
-zone "bl8."		{type master; file "bl.db"; };
-zone "bl9."		{type master; file "bl.db"; };
-zone "bl10."		{type master; file "bl.db"; };
-zone "bl11."		{type master; file "bl.db"; };
-zone "bl12."		{type master; file "bl.db"; };
-zone "bl13."		{type master; file "bl.db"; };
-zone "bl14."		{type master; file "bl.db"; };
-zone "bl15."		{type master; file "bl.db"; };
-zone "bl16."		{type master; file "bl.db"; };
-zone "bl17."		{type master; file "bl.db"; };
-zone "bl18."		{type master; file "bl.db"; };
-zone "bl19."		{type master; file "bl.db"; };
+zone "bl0."		{type primary; file "bl.db"; };
+zone "bl1."		{type primary; file "bl.db"; };
+zone "bl2."		{type primary; file "bl.db"; };
+zone "bl3."		{type primary; file "bl.db"; };
+zone "bl4."		{type primary; file "bl.db"; };
+zone "bl5."		{type primary; file "bl.db"; };
+zone "bl6."		{type primary; file "bl.db"; };
+zone "bl7."		{type primary; file "bl.db"; };
+zone "bl8."		{type primary; file "bl.db"; };
+zone "bl9."		{type primary; file "bl.db"; };
+zone "bl10."		{type primary; file "bl.db"; };
+zone "bl11."		{type primary; file "bl.db"; };
+zone "bl12."		{type primary; file "bl.db"; };
+zone "bl13."		{type primary; file "bl.db"; };
+zone "bl14."		{type primary; file "bl.db"; };
+zone "bl15."		{type primary; file "bl.db"; };
+zone "bl16."		{type primary; file "bl.db"; };
+zone "bl17."		{type primary; file "bl.db"; };
+zone "bl18."		{type primary; file "bl.db"; };
+zone "bl19."		{type primary; file "bl.db"; };
 
 zone "policy1" {
-	type master;
+	type primary;
 	file "empty.db";
 	also-notify { 10.53.0.6; };
 	allow-update { any; };
@@ -81,7 +81,7 @@ zone "policy1" {
 };
 
 zone "policy2" {
-	type master;
+	type primary;
 	file "policy2.db";
 	allow-update { any; };
 	allow-transfer { any; };
diff --git a/bin/tests/system/rpz/ns6/named.conf.in b/bin/tests/system/rpz/ns6/named.conf.in
index d5bf866a31..e036480bf9 100644
--- a/bin/tests/system/rpz/ns6/named.conf.in
+++ b/bin/tests/system/rpz/ns6/named.conf.in
@@ -50,7 +50,7 @@ controls {
 include "../trusted.conf";
 
 zone "policy1" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.5; };
 	file "empty.db";
 	also-notify { 10.53.0.3 port @EXTRAPORT1@; };
diff --git a/bin/tests/system/rpz/ns7/named.conf.in b/bin/tests/system/rpz/ns7/named.conf.in
index 2d135058a3..8fa0951012 100644
--- a/bin/tests/system/rpz/ns7/named.conf.in
+++ b/bin/tests/system/rpz/ns7/named.conf.in
@@ -47,7 +47,7 @@ controls {
 include "../trusted.conf";
 
 zone "policy2" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.5; };
 	file "policy2.db";
 	also-notify { 10.53.0.3 port @EXTRAPORT1@; };
diff --git a/bin/tests/system/rpz/ns8/named.conf.in b/bin/tests/system/rpz/ns8/named.conf.in
index 430ca14198..7f241c115a 100644
--- a/bin/tests/system/rpz/ns8/named.conf.in
+++ b/bin/tests/system/rpz/ns8/named.conf.in
@@ -59,7 +59,7 @@ controls {
 zone "." { type hint; file "hints"; };
 
 zone "manual-update-rpz." {
-	type master;
+	type primary;
 	file "manual-update-rpz.db";
 	notify no;
 };
diff --git a/bin/tests/system/rpz/ns9/named.conf.in b/bin/tests/system/rpz/ns9/named.conf.in
index 123ab95b03..1b15071b82 100644
--- a/bin/tests/system/rpz/ns9/named.conf.in
+++ b/bin/tests/system/rpz/ns9/named.conf.in
@@ -53,7 +53,7 @@ controls {
 zone "." { type hint; file "hints"; };
 
 zone "rpz." {
-	type master;
+	type primary;
 	file "rpz.db";
 	notify no;
 };
diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index f1bdc12a7f..4edd5f5137 100644
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -579,7 +579,7 @@ EOF
   nochange a4-4.tld2				# 15 PASSTHRU
   nxdomain c2.crash2.tld3			# 16 assert in rbtdb.c
   addr 127.0.0.17 "a4-4.tld2 -b $ns1"		# 17 client-IP address trigger
-  nxdomain a7-1.tld2				# 18 slave policy zone (RT34450)
+  nxdomain a7-1.tld2				# 18 secondary policy zone (RT34450)
   # updating an response zone policy
   cp ns2/blv2.tld2.db.in ns2/bl.tld2.db
   rndc_reload ns2 $ns2 bl.tld2
@@ -590,7 +590,7 @@ EOF
   cp ns2/blv3.tld2.db.in ns2/bl.tld2.db
   rndc_reload ns2 $ns2 bl.tld2
   ck_soa 3 bl.tld2 $ns3
-  nxdomain a7-1.tld2				# 20 slave policy zone (RT34450)
+  nxdomain a7-1.tld2				# 20 secondary policy zone (RT34450)
   end_group
   ckstats $ns3 test2 ns3 12
 
@@ -778,7 +778,7 @@ EOF
     done
   fi
 
-  # reconfigure the ns5 master server without the fast-exire zone, so
+  # reconfigure the ns5 primary server without the fast-exire zone, so
   # it can't be refreshed on ns3, and will expire in 5 seconds.
   cat /dev/null > ns5/expire.conf
   rndc_reconfig ns5 10.53.0.5
@@ -834,7 +834,7 @@ EOF
   t=`expr $t + 1`
   echo_i "checking rpz updates/transfers with parent nodes added after children (${t})"
   # regression test for RT #36272: the success condition
-  # is the slave server not crashing.
+  # is the secondary server not crashing.
   for i in 1 2 3 4 5; do
     nsd $ns5 add example.com.policy1. '*.example.com.policy1.'
     nsd $ns5 delete example.com.policy1. '*.example.com.policy1.'
diff --git a/bin/tests/system/rpzextra/ns1/named.conf.in b/bin/tests/system/rpzextra/ns1/named.conf.in
index 23cbad05a8..d7ffbf3d40 100644
--- a/bin/tests/system/rpzextra/ns1/named.conf.in
+++ b/bin/tests/system/rpzextra/ns1/named.conf.in
@@ -47,7 +47,7 @@ logging {
 };
 
 zone "rpz.local" {
-    type master;
+    type primary;
     file "rpz.local.db";
     allow-transfer { none; };
     allow-query { localhost; };
diff --git a/bin/tests/system/rpzextra/ns2/named.conf.in b/bin/tests/system/rpzextra/ns2/named.conf.in
index 7af2f69b5a..39e110316c 100644
--- a/bin/tests/system/rpzextra/ns2/named.conf.in
+++ b/bin/tests/system/rpzextra/ns2/named.conf.in
@@ -20,13 +20,13 @@ options {
 };
 
 zone "allowed" {
-    type master;
+    type primary;
 	file "allowed.db";
 	allow-transfer { none; };
 };
 
 zone "baddomain" {
-    type master;
+    type primary;
     file "baddomain.db";
     allow-transfer { none; };
 };
diff --git a/bin/tests/system/rrl/ns1/named.conf.in b/bin/tests/system/rrl/ns1/named.conf.in
index 2faa95c8be..177c67fcc5 100644
--- a/bin/tests/system/rrl/ns1/named.conf.in
+++ b/bin/tests/system/rrl/ns1/named.conf.in
@@ -23,4 +23,4 @@ options {
 	dnssec-validation yes;
 };
 
-zone "." {type master; file "root.db";};
+zone "." {type primary; file "root.db";};
diff --git a/bin/tests/system/rrl/ns2/named.conf.in b/bin/tests/system/rrl/ns2/named.conf.in
index 66ab0ed770..4ce1477494 100644
--- a/bin/tests/system/rrl/ns2/named.conf.in
+++ b/bin/tests/system/rrl/ns2/named.conf.in
@@ -60,4 +60,4 @@ logging {
 
 zone "." { type hint; file "hints"; };
 
-zone "tld2."{ type master; file "tld2.db"; };
+zone "tld2."{ type primary; file "tld2.db"; };
diff --git a/bin/tests/system/rrl/ns3/named.conf.in b/bin/tests/system/rrl/ns3/named.conf.in
index 1bacc6bf88..d8156d8b8c 100644
--- a/bin/tests/system/rrl/ns3/named.conf.in
+++ b/bin/tests/system/rrl/ns3/named.conf.in
@@ -43,4 +43,4 @@ options {
 
 zone "." { type hint; file "hints"; };
 
-zone "tld3."{ type master; file "tld3.db"; };
+zone "tld3."{ type primary; file "tld3.db"; };
diff --git a/bin/tests/system/rrl/ns4/named.conf.in b/bin/tests/system/rrl/ns4/named.conf.in
index a394939776..028281fe74 100644
--- a/bin/tests/system/rrl/ns4/named.conf.in
+++ b/bin/tests/system/rrl/ns4/named.conf.in
@@ -61,4 +61,4 @@ logging {
 
 zone "." { type hint; file "hints"; };
 
-zone "tld4."{ type master; file "tld4.db"; };
+zone "tld4."{ type primary; file "tld4.db"; };
diff --git a/bin/tests/system/rrsetorder/ns1/named.conf.in b/bin/tests/system/rrsetorder/ns1/named.conf.in
index 6e009f4835..bccd32a4f8 100644
--- a/bin/tests/system/rrsetorder/ns1/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns1/named.conf.in
@@ -30,7 +30,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 	notify explicit;
 	also-notify { 10.53.0.2; };
diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.in b/bin/tests/system/rrsetorder/ns2/named.conf.in
index 3ebbf76783..7d0ecfbf0a 100644
--- a/bin/tests/system/rrsetorder/ns2/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns2/named.conf.in
@@ -30,7 +30,7 @@ options {
 };
 
 zone "." {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "root.bk";
 };
diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index 72bface88d..a3450f1a38 100644
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -30,7 +30,7 @@ fi
 #
 #
 if $test_fixed; then
-    echo_i "Checking order fixed (master)"
+    echo_i "Checking order fixed (primary)"
     ret=0
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
@@ -40,7 +40,7 @@ if $test_fixed; then
     if [ $ret != 0 ]; then echo_i "failed"; fi
     status=`expr $status + $ret`
 else
-    echo_i "Checking order fixed behaves as cyclic when disabled (master)"
+    echo_i "Checking order fixed behaves as cyclic when disabled (primary)"
     ret=0
     matches=0
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -67,7 +67,7 @@ fi
 #
 #
 #
-echo_i "Checking order cyclic (master + additional)"
+echo_i "Checking order cyclic (primary + additional)"
 ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -93,7 +93,7 @@ status=`expr $status + $ret`
 #
 #
 #
-echo_i "Checking order cyclic (master)"
+echo_i "Checking order cyclic (primary)"
 ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -115,7 +115,7 @@ $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
-echo_i "Checking order random (master)"
+echo_i "Checking order random (primary)"
 ret=0
 for i in $GOOD_RANDOM
 do
@@ -146,7 +146,7 @@ status=`expr $status + $ret`
 #
 #
 if $test_fixed; then
-    echo_i "Checking order fixed (slave)"
+    echo_i "Checking order fixed (secondary)"
     ret=0
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
@@ -160,7 +160,7 @@ fi
 #
 #
 #
-echo_i "Checking order cyclic (slave + additional)"
+echo_i "Checking order cyclic (secondary + additional)"
 ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -186,7 +186,7 @@ status=`expr $status + $ret`
 #
 #
 #
-echo_i "Checking order cyclic (slave)"
+echo_i "Checking order cyclic (secondary)"
 ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -209,7 +209,7 @@ if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "Checking order random (slave)"
+echo_i "Checking order random (secondary)"
 ret=0
 for i in $GOOD_RANDOM
 do
@@ -236,11 +236,11 @@ if [ $match -lt `expr ${GOOD_RANDOM_NO} / 3` ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "Shutting down slave"
+echo_i "Shutting down secondary"
 
 (cd ..; $SHELL stop.sh rrsetorder ns2 )
 
-echo_i "Checking for slave's on disk copy of zone"
+echo_i "Checking for secondary's on disk copy of zone"
 
 if [ ! -f ns2/root.bk ]
 then
@@ -248,7 +248,7 @@ then
 	status=`expr $status + 1`
 fi
 
-echo_i "Re-starting slave"
+echo_i "Re-starting secondary"
 
 start_server --noclean --port ${PORT} rrsetorder ns2
 
@@ -256,7 +256,7 @@ start_server --noclean --port ${PORT} rrsetorder ns2
 #
 #
 if $test_fixed; then
-    echo_i "Checking order fixed (slave loaded from disk)"
+    echo_i "Checking order fixed (secondary loaded from disk)"
     ret=0
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
@@ -270,7 +270,7 @@ fi
 #
 #
 #
-echo_i "Checking order cyclic (slave + additional, loaded from disk)"
+echo_i "Checking order cyclic (secondary + additional, loaded from disk)"
 ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -296,7 +296,7 @@ status=`expr $status + $ret`
 #
 #
 #
-echo_i "Checking order cyclic (slave loaded from disk)"
+echo_i "Checking order cyclic (secondary loaded from disk)"
 ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -319,7 +319,7 @@ if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-echo_i "Checking order random (slave loaded from disk)"
+echo_i "Checking order random (secondary loaded from disk)"
 ret=0
 for i in $GOOD_RANDOM
 do
diff --git a/bin/tests/system/rsabigexponent/ns1/named.conf.in b/bin/tests/system/rsabigexponent/ns1/named.conf.in
index 95e7bd6312..6122dc1a51 100644
--- a/bin/tests/system/rsabigexponent/ns1/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns1/named.conf.in
@@ -25,7 +25,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
 
diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.in b/bin/tests/system/rsabigexponent/ns2/named.conf.in
index b7963e50a7..7f30c66cd6 100644
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.in
@@ -29,7 +29,7 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db.bad";
 };
 
diff --git a/bin/tests/system/serve-stale/ns1/named1.conf.in b/bin/tests/system/serve-stale/ns1/named1.conf.in
index c29bcd7a44..04fe0ce3bd 100644
--- a/bin/tests/system/serve-stale/ns1/named1.conf.in
+++ b/bin/tests/system/serve-stale/ns1/named1.conf.in
@@ -34,6 +34,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/serve-stale/ns1/named2.conf.in b/bin/tests/system/serve-stale/ns1/named2.conf.in
index a41f07b140..6361f591a6 100644
--- a/bin/tests/system/serve-stale/ns1/named2.conf.in
+++ b/bin/tests/system/serve-stale/ns1/named2.conf.in
@@ -34,6 +34,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/serve-stale/ns3/named.conf.in b/bin/tests/system/serve-stale/ns3/named.conf.in
index c37aa9c256..451cfd47ae 100644
--- a/bin/tests/system/serve-stale/ns3/named.conf.in
+++ b/bin/tests/system/serve-stale/ns3/named.conf.in
@@ -32,7 +32,7 @@ options {
 };
 
 zone "." {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "root.bk";
 };
diff --git a/bin/tests/system/serve-stale/ns4/named.conf.in b/bin/tests/system/serve-stale/ns4/named.conf.in
index 4cd8bc4b64..c2b05e1ec3 100644
--- a/bin/tests/system/serve-stale/ns4/named.conf.in
+++ b/bin/tests/system/serve-stale/ns4/named.conf.in
@@ -32,7 +32,7 @@ options {
 };
 
 zone "." {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "root.bk";
 };
diff --git a/bin/tests/system/sfcache/ns1/named.conf.in b/bin/tests/system/sfcache/ns1/named.conf.in
index 95e7bd6312..6122dc1a51 100644
--- a/bin/tests/system/sfcache/ns1/named.conf.in
+++ b/bin/tests/system/sfcache/ns1/named.conf.in
@@ -25,7 +25,7 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
 
diff --git a/bin/tests/system/sfcache/ns2/named.conf.in b/bin/tests/system/sfcache/ns2/named.conf.in
index 12eabe39cf..09c9d1c70c 100644
--- a/bin/tests/system/sfcache/ns2/named.conf.in
+++ b/bin/tests/system/sfcache/ns2/named.conf.in
@@ -39,7 +39,7 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db.signed";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/sortlist/ns1/named.conf.in b/bin/tests/system/sortlist/ns1/named.conf.in
index 90156811ff..a3df0e35ac 100644
--- a/bin/tests/system/sortlist/ns1/named.conf.in
+++ b/bin/tests/system/sortlist/ns1/named.conf.in
@@ -33,11 +33,11 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/spf/ns1/named.conf.in b/bin/tests/system/spf/ns1/named.conf.in
index 255da60e21..d376ab00f8 100644
--- a/bin/tests/system/spf/ns1/named.conf.in
+++ b/bin/tests/system/spf/ns1/named.conf.in
@@ -23,18 +23,18 @@ options {
 };
 
 zone "spf" {
-	type master;
+	type primary;
 	file "spf.db";
 };
 
 zone "warn" {
-	type master;
+	type primary;
 	file "spf.db";
 	check-spf warn;
 };
 
 zone "nowarn" {
-	type master;
+	type primary;
 	file "spf.db";
 	check-spf ignore;
 };
diff --git a/bin/tests/system/staticstub/ns1/named.conf.in b/bin/tests/system/staticstub/ns1/named.conf.in
index f251b17b0b..f80374b5a2 100644
--- a/bin/tests/system/staticstub/ns1/named.conf.in
+++ b/bin/tests/system/staticstub/ns1/named.conf.in
@@ -20,4 +20,4 @@ options {
 	notify no;
 };
 
-zone "." { type master; file "root.db"; };
+zone "." { type primary; file "root.db"; };
diff --git a/bin/tests/system/staticstub/ns3/named.conf.in b/bin/tests/system/staticstub/ns3/named.conf.in
index 8f76cedce5..7391896937 100644
--- a/bin/tests/system/staticstub/ns3/named.conf.in
+++ b/bin/tests/system/staticstub/ns3/named.conf.in
@@ -34,11 +34,11 @@ options {
 EXAMPLE_ZONE_PLACEHOLDER
 
 zone "example.org" {
-	type master;
+	type primary;
 	file "example.org.db";
 };
 
 zone "undelegated" {
-	type master;
+	type primary;
 	file "undelegated.db.signed";
 };
diff --git a/bin/tests/system/staticstub/ns4/named.conf.in b/bin/tests/system/staticstub/ns4/named.conf.in
index 6ad8b20407..dc6006df3d 100644
--- a/bin/tests/system/staticstub/ns4/named.conf.in
+++ b/bin/tests/system/staticstub/ns4/named.conf.in
@@ -23,21 +23,21 @@ options {
 };
 
 zone "example.com" {
-	type master;
+	type primary;
 	file "example.com.db";
 };
 
 zone "example.org" {
-	type master;
+	type primary;
 	file "example.org.db";
 };
 
 zone "sub.example" {
-	type master;
+	type primary;
 	file "sub.example.db.signed";
 };
 
 zone "example.info" {
-	type master;
+	type primary;
 	file "example.info.db";
 };
diff --git a/bin/tests/system/statistics/ns1/named.conf.in b/bin/tests/system/statistics/ns1/named.conf.in
index 9bccd3c063..b0e66bb0ab 100644
--- a/bin/tests/system/statistics/ns1/named.conf.in
+++ b/bin/tests/system/statistics/ns1/named.conf.in
@@ -27,16 +27,16 @@ statistics-channels {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "example.info." {
-	type master;
+	type primary;
 	file "example-info.db";
 };
 
 zone "32/1.0.0.127-in-addr.example." {
-	type master;
+	type primary;
 	file "zone.db";
 };
diff --git a/bin/tests/system/statistics/ns2/named.conf.in b/bin/tests/system/statistics/ns2/named.conf.in
index be8b1e3e53..2e503d1d88 100644
--- a/bin/tests/system/statistics/ns2/named.conf.in
+++ b/bin/tests/system/statistics/ns2/named.conf.in
@@ -42,7 +42,7 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/statistics/ns3/named.conf.in b/bin/tests/system/statistics/ns3/named.conf.in
index 504ad540e6..543110de22 100644
--- a/bin/tests/system/statistics/ns3/named.conf.in
+++ b/bin/tests/system/statistics/ns3/named.conf.in
@@ -45,13 +45,13 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "internal.db";
 };
 
-zone "a-slave" {
-	type slave;
-	file "slave.bk";
+zone "a-secondary" {
+	type secondary;
+	file "sec.bk";
 	primaries { 10.53.0.1; };
 };
diff --git a/bin/tests/system/statschannel/ns1/named.conf.in b/bin/tests/system/statschannel/ns1/named.conf.in
index fa1cd57a6c..de3c420a1c 100644
--- a/bin/tests/system/statschannel/ns1/named.conf.in
+++ b/bin/tests/system/statschannel/ns1/named.conf.in
@@ -35,7 +35,7 @@ controls {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-transfer { any; };
 };
diff --git a/bin/tests/system/statschannel/ns2/named.conf.in b/bin/tests/system/statschannel/ns2/named.conf.in
index 9eebe560d3..68367989cc 100644
--- a/bin/tests/system/statschannel/ns2/named.conf.in
+++ b/bin/tests/system/statschannel/ns2/named.conf.in
@@ -46,13 +46,13 @@ dnssec-policy "manykeys" {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-transfer { any; };
 };
 
 zone "dnssec" {
-	type master;
+	type primary;
 	file "dnssec.db.signed";
 	auto-dnssec maintain;
 	allow-update { any; };
@@ -62,7 +62,7 @@ zone "dnssec" {
 };
 
 zone "manykeys" {
-        type master;
+        type primary;
         file "manykeys.db.signed";
 	zone-statistics full;
 	dnssec-policy "manykeys";
diff --git a/bin/tests/system/stub/ns1/named.conf.in b/bin/tests/system/stub/ns1/named.conf.in
index b4ad1523fa..eb072be055 100644
--- a/bin/tests/system/stub/ns1/named.conf.in
+++ b/bin/tests/system/stub/ns1/named.conf.in
@@ -23,6 +23,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/stub/ns2/named.conf.in b/bin/tests/system/stub/ns2/named.conf.in
index 37e38c5735..a357c31415 100644
--- a/bin/tests/system/stub/ns2/named.conf.in
+++ b/bin/tests/system/stub/ns2/named.conf.in
@@ -28,6 +28,6 @@ zone "." {
 };
 
 zone "child.example" {
-	type master;
+	type primary;
 	file "child.example.db";
 };
diff --git a/bin/tests/system/stub/ns3/named.conf.in b/bin/tests/system/stub/ns3/named.conf.in
index b21509ae04..4e29f2a343 100644
--- a/bin/tests/system/stub/ns3/named.conf.in
+++ b/bin/tests/system/stub/ns3/named.conf.in
@@ -28,7 +28,7 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.in b/bin/tests/system/synthfromdnssec/ns1/named.conf.in
index cb0c0c372b..3f75553d93 100644
--- a/bin/tests/system/synthfromdnssec/ns1/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.in
@@ -25,17 +25,17 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db.signed";
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db.signed";
 };
 
 zone "dnamed" {
-	type master;
+	type primary;
 	file "dnamed.db.signed";
 };
 
diff --git a/bin/tests/system/tcp/ns1/named.conf.in b/bin/tests/system/tcp/ns1/named.conf.in
index b188783a05..0a614cae79 100644
--- a/bin/tests/system/tcp/ns1/named.conf.in
+++ b/bin/tests/system/tcp/ns1/named.conf.in
@@ -32,6 +32,6 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/tcp/ns2/named.conf.in b/bin/tests/system/tcp/ns2/named.conf.in
index 684b881050..7751f7e095 100644
--- a/bin/tests/system/tcp/ns2/named.conf.in
+++ b/bin/tests/system/tcp/ns2/named.conf.in
@@ -38,7 +38,7 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in
index 4496d32372..198953ad67 100644
--- a/bin/tests/system/tkey/ns1/named.conf.in
+++ b/bin/tests/system/tkey/ns1/named.conf.in
@@ -41,7 +41,7 @@ key "tkeytest." {
 };
 
 zone example {
-	type master;
+	type primary;
 	file "example.db";
 	allow-query { key tkeytest.; none; };
 };
diff --git a/bin/tests/system/tsig/ns1/named.conf.in b/bin/tests/system/tsig/ns1/named.conf.in
index fbf30c6dc4..cc8caf8367 100644
--- a/bin/tests/system/tsig/ns1/named.conf.in
+++ b/bin/tests/system/tsig/ns1/named.conf.in
@@ -82,6 +82,6 @@ key "sha512-trunc" {
 };
 
 zone "example.nil" {
-	type master;
+	type primary;
 	file "example.db";
 };
diff --git a/bin/tests/system/tsiggss/ns1/named.conf.in b/bin/tests/system/tsiggss/ns1/named.conf.in
index 583cb379d9..9a6b329ca7 100644
--- a/bin/tests/system/tsiggss/ns1/named.conf.in
+++ b/bin/tests/system/tsiggss/ns1/named.conf.in
@@ -33,7 +33,7 @@ controls {
 };
 
 zone "example.nil." IN {
-	type master;
+	type primary;
 	file "example.nil.db";
 
 	update-policy {
diff --git a/bin/tests/system/ttl/ns1/named.conf.in b/bin/tests/system/ttl/ns1/named.conf.in
index 211d9591bb..8a3bca36d7 100644
--- a/bin/tests/system/ttl/ns1/named.conf.in
+++ b/bin/tests/system/ttl/ns1/named.conf.in
@@ -36,11 +36,11 @@ zone "." {
 };
 
 zone "min-example" {
-	type master;
+	type primary;
 	file "min-example.db";
 };
 
 zone "max-example" {
-	type master;
+	type primary;
 	file "max-example.db";
 };
diff --git a/bin/tests/system/unknown/ns1/named.conf.in b/bin/tests/system/unknown/ns1/named.conf.in
index e92b9c4eff..644045fb5b 100644
--- a/bin/tests/system/unknown/ns1/named.conf.in
+++ b/bin/tests/system/unknown/ns1/named.conf.in
@@ -23,32 +23,32 @@ options {
 
 view "in" {
 	zone "example." {
-		type master;
+		type primary;
 		file "example-in.db";
 	};
 
 	zone "broken1." {
-		type master;
+		type primary;
 		file "broken1.db";
 	};
 
 	zone "broken2." {
-		type master;
+		type primary;
 		file "broken2.db";
 	};
 
 	zone "broken3." {
-		type master;
+		type primary;
 		file "broken3.db";
 	};
 
 	zone "broken4." {
-		type master;
+		type primary;
 		file "broken4.db";
 	};
 
 	zone "broken5." {
-		type master;
+		type primary;
 		file "broken5.db";
 	};
 };
@@ -60,7 +60,7 @@ view "class10" class10 {
 	};
 
 	zone "example." class10 {
-		type master;
+		type primary;
 		file "example-class10.db";
 	};
 };
diff --git a/bin/tests/system/unknown/ns2/named.conf.in b/bin/tests/system/unknown/ns2/named.conf.in
index 0be791ea4f..bdae36ae17 100644
--- a/bin/tests/system/unknown/ns2/named.conf.in
+++ b/bin/tests/system/unknown/ns2/named.conf.in
@@ -23,7 +23,7 @@ options {
 
 view "in" {
 	zone "example." {
-		type slave;
+		type secondary;
 		primaries { 10.53.0.1; };
 		file "example-in.bk";
 	};
diff --git a/bin/tests/system/unknown/ns3/named.conf.in b/bin/tests/system/unknown/ns3/named.conf.in
index 056e3ac4b3..b665d17f54 100644
--- a/bin/tests/system/unknown/ns3/named.conf.in
+++ b/bin/tests/system/unknown/ns3/named.conf.in
@@ -23,7 +23,7 @@ options {
 
 view "in" {
 	zone "example." {
-		type slave;
+		type secondary;
 		primaries { 10.53.0.1; };
 		inline-signing yes;
 		auto-dnssec maintain;
diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh
index 6b6f853d28..b87b0ef338 100644
--- a/bin/tests/system/unknown/tests.sh
+++ b/bin/tests/system/unknown/tests.sh
@@ -120,7 +120,7 @@ do
 	status=`expr $status + $ret`
 done
 
-echo_i "checking large unknown record loading on master"
+echo_i "checking large unknown record loading on primary"
 for try in 0 1 2 3 4 5 6 7 8 9; do
     ret=0
     $DIG $DIGOPTS @10.53.0.1 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }
@@ -131,7 +131,7 @@ done
 [ $ret = 0 ] || echo_i "failed"
 status=`expr $status + $ret`
 
-echo_i "checking large unknown record loading on slave"
+echo_i "checking large unknown record loading on secondary"
 for try in 0 1 2 3 4 5 6 7 8 9; do
     ret=0
     $DIG $DIGOPTS @10.53.0.2 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }
@@ -142,13 +142,13 @@ done
 [ $ret = 0 ] || echo_i "failed"
 status=`expr $status + $ret`
 
-echo_i "stop and restart slave"
+echo_i "stop and restart secondary"
 $PERL $SYSTEMTESTTOP/stop.pl unknown ns2
 start_server --noclean --restart --port ${PORT} unknown ns2
 
 # server may be answering queries before zones are loaded,
 # so retry a few times if this query fails
-echo_i "checking large unknown record loading on slave"
+echo_i "checking large unknown record loading on secondary"
 for try in 0 1 2 3 4 5 6 7 8 9; do
     ret=0
     $DIG $DIGOPTS @10.53.0.2 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }
@@ -159,20 +159,20 @@ done
 [ $ret = 0 ] || echo_i "failed"
 status=`expr $status + $ret`
 
-echo_i "checking large unknown record loading on inline slave"
+echo_i "checking large unknown record loading on inline secondary"
 ret=0
 $DIG $DIGOPTS @10.53.0.3 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }
 $DIFF large.out dig.out > /dev/null || { ret=1 ; echo_i "$DIFF failed"; }
 [ $ret = 0 ] || echo_i "failed"
 status=`expr $status + $ret`
 
-echo_i "stop and restart inline slave"
+echo_i "stop and restart inline secondary"
 $PERL $SYSTEMTESTTOP/stop.pl unknown ns3
 start_server --noclean --restart --port ${PORT} unknown ns3
 
 # server may be answering queries before zones are loaded,
 # so retry a few times if this query fails
-echo_i "checking large unknown record loading on inline slave"
+echo_i "checking large unknown record loading on inline secondary"
 for try in 0 1 2 3 4 5 6 7 8 9; do
     ret=0
     $DIG $DIGOPTS @10.53.0.3 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }
diff --git a/bin/tests/system/upforwd/ns1/named.conf.in b/bin/tests/system/upforwd/ns1/named.conf.in
index ea42b4d473..3873c7c733 100644
--- a/bin/tests/system/upforwd/ns1/named.conf.in
+++ b/bin/tests/system/upforwd/ns1/named.conf.in
@@ -27,13 +27,13 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-update { key update.example.; 10.53.0.3; };
 };
 
 zone "example2" {
-	type master;
+	type primary;
 	file "example2.db";
 	allow-update { key sig0.example2.; };
 };
diff --git a/bin/tests/system/upforwd/ns2/named.conf.in b/bin/tests/system/upforwd/ns2/named.conf.in
index 2a609e4c20..3310f1fe06 100644
--- a/bin/tests/system/upforwd/ns2/named.conf.in
+++ b/bin/tests/system/upforwd/ns2/named.conf.in
@@ -22,13 +22,13 @@ options {
 };
 
 zone "example" {
-	type slave;
+	type secondary;
 	file "example.bk";
 	primaries { 10.53.0.1; };
 };
 
 zone "example2" {
-	type slave;
+	type secondary;
 	file "example2.bk";
 	primaries { 10.53.0.1; };
 };
diff --git a/bin/tests/system/upforwd/ns3/named.conf.in b/bin/tests/system/upforwd/ns3/named.conf.in
index ded5d7348b..e9f97698af 100644
--- a/bin/tests/system/upforwd/ns3/named.conf.in
+++ b/bin/tests/system/upforwd/ns3/named.conf.in
@@ -22,21 +22,21 @@ options {
 };
 
 zone "example" {
-	type slave;
+	type secondary;
 	file "example.bk";
 	allow-update-forwarding { any; };
 	primaries { 10.53.0.1; };
 };
 
 zone "example2" {
-	type slave;
+	type secondary;
 	file "example2.bk";
 	allow-update-forwarding { any; };
 	primaries { 10.53.0.1; };
 };
 
 zone "nomaster" {
-	type slave;
+	type secondary;
 	file "nomaster1.db";
 	allow-update-forwarding { any; };
 	masterfile-format text;
diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
index 234fe53637..a07cceeab1 100644
--- a/bin/tests/system/upforwd/tests.sh
+++ b/bin/tests/system/upforwd/tests.sh
@@ -9,9 +9,9 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# ns1 = stealth master
-# ns2 = slave with update forwarding disabled; not currently used
-# ns3 = slave with update forwarding enabled
+# ns1 = stealth primary
+# ns2 = secondary with update forwarding disabled; not currently used
+# ns3 = secondary with update forwarding enabled
 
 . $SYSTEMTESTTOP/conf.sh
 
@@ -36,20 +36,20 @@ done
 if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
 n=`expr $n + 1`
 
-echo_i "fetching master copy of zone before update ($n)"
+echo_i "fetching primary copy of zone before update ($n)"
 ret=0
 $DIG $DIGOPTS example.\
 	@10.53.0.1 axfr > dig.out.ns1 || ret=1
 if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
 n=`expr $n + 1`
 
-echo_i "fetching slave 1 copy of zone before update ($n)"
+echo_i "fetching secondary 1 copy of zone before update ($n)"
 $DIG $DIGOPTS example.\
 	@10.53.0.2 axfr > dig.out.ns2 || ret=1
 if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
 n=`expr $n + 1`
 
-echo_i "fetching slave 2 copy of zone before update ($n)"
+echo_i "fetching secondary 2 copy of zone before update ($n)"
 ret=0
 $DIG $DIGOPTS example.\
 	@10.53.0.3 axfr > dig.out.ns3 || ret=1
@@ -77,20 +77,20 @@ n=`expr $n + 1`
 echo_i "sleeping 15 seconds for server to incorporate changes"
 sleep 15
 
-echo_i "fetching master copy of zone after update ($n)"
+echo_i "fetching primary copy of zone after update ($n)"
 ret=0
 $DIG $DIGOPTS example.\
 	@10.53.0.1 axfr > dig.out.ns1 || ret=1
 if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
 n=`expr $n + 1`
 
-echo_i "fetching slave 1 copy of zone after update ($n)"
+echo_i "fetching secondary 1 copy of zone after update ($n)"
 ret=0
 $DIG $DIGOPTS example.\
 	@10.53.0.2 axfr > dig.out.ns2 || ret=1
 if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
 
-echo_i "fetching slave 2 copy of zone after update ($n)"
+echo_i "fetching secondary 2 copy of zone after update ($n)"
 ret=0
 $DIG $DIGOPTS example.\
 	@10.53.0.3 axfr > dig.out.ns3 || ret=1
@@ -124,20 +124,20 @@ n=`expr $n + 1`
 echo_i "sleeping 15 seconds for server to incorporate changes"
 sleep 15
 
-echo_i "fetching master copy of zone after update ($n)"
+echo_i "fetching primary copy of zone after update ($n)"
 ret=0
 $DIG $DIGOPTS example.\
 	@10.53.0.1 axfr > dig.out.ns1 || ret=1
 if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
 
-echo_i "fetching slave 1 copy of zone after update ($n)"
+echo_i "fetching secondary 1 copy of zone after update ($n)"
 ret=0
 $DIG $DIGOPTS example.\
 	@10.53.0.2 axfr > dig.out.ns2 || ret=1
 if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
 n=`expr $n + 1`
 
-echo_i "fetching slave 2 copy of zone after update ($n)"
+echo_i "fetching secondary 2 copy of zone after update ($n)"
 ret=0
 $DIG $DIGOPTS example.\
 	@10.53.0.3 axfr > dig.out.ns3 || ret=1
@@ -151,7 +151,7 @@ digcomp knowngood.after2 dig.out.ns3 || ret=1
 if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
 n=`expr $n + 1`
 
-echo_i "checking update forwarding to dead master ($n)"
+echo_i "checking update forwarding to dead primary ($n)"
 count=0
 ret=0
 while [ $count -lt 5 -a $ret -eq 0 ]
diff --git a/bin/tests/system/views/ns1/named.conf.in b/bin/tests/system/views/ns1/named.conf.in
index b4a2fa8c05..6bbbe90ea1 100644
--- a/bin/tests/system/views/ns1/named.conf.in
+++ b/bin/tests/system/views/ns1/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in
index b91f95b043..4ad0e557e3 100644
--- a/bin/tests/system/views/ns2/named1.conf.in
+++ b/bin/tests/system/views/ns2/named1.conf.in
@@ -37,7 +37,7 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 	allow-update { any; };
 };
diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in
index b9456e0b48..66713fcf8a 100644
--- a/bin/tests/system/views/ns2/named2.conf.in
+++ b/bin/tests/system/views/ns2/named2.conf.in
@@ -40,24 +40,24 @@ view "internal" {
 	};
 
 	zone "example" {
-		type master;
+		type primary;
 		file "internal.db";
 		allow-update { any; };
 	};
 
 	zone "clone" {
-		type master;
+		type primary;
 		file "clone.db";
 		allow-update { any; };
 	};
 
 	zone "1.10.in-addr.arpa" {
-		type master;
+		type primary;
 		file "1.10.in-addr.arpa.db";
 	};
 
 	zone "inline" {
-		type master;
+		type primary;
 		file "internal/inline.db";
 		key-directory "internal";
 		auto-dnssec maintain;
@@ -74,7 +74,7 @@ view "external" {
 	};
 
 	zone "example" {
-		type master;
+		type primary;
 		file "example.db";
 	};
 
@@ -89,7 +89,7 @@ view "external" {
 	};
 
 	zone "inline" {
-		type master;
+		type primary;
 		file "external/inline.db";
 		key-directory "external";
 		auto-dnssec maintain;
diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named1.conf.in
index 617df48b48..b1cc55dbec 100644
--- a/bin/tests/system/views/ns3/named1.conf.in
+++ b/bin/tests/system/views/ns3/named1.conf.in
@@ -37,12 +37,12 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "internal.db";
 };
 
 zone "child.clone" {
-	type master;
+	type primary;
 	file "child.clone.db";
 };
diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.in
index 63d861082d..ce9607996c 100644
--- a/bin/tests/system/views/ns3/named2.conf.in
+++ b/bin/tests/system/views/ns3/named2.conf.in
@@ -37,12 +37,12 @@ zone "." {
 };
 
 zone "example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	file "internal.bk";
 };
 
 zone "child.clone" {
-	type master;
+	type primary;
 	file "child.clone.db";
 };
diff --git a/bin/tests/system/views/ns5/named.conf.in b/bin/tests/system/views/ns5/named.conf.in
index d30998787a..9be2036341 100644
--- a/bin/tests/system/views/ns5/named.conf.in
+++ b/bin/tests/system/views/ns5/named.conf.in
@@ -37,6 +37,6 @@ zone "." {
 };
 
 zone "child.clone" {
-	type master;
+	type primary;
 	file "child.clone.db";
 };
diff --git a/bin/tests/system/wildcard/ns1/named.conf.in b/bin/tests/system/wildcard/ns1/named.conf.in
index 8a66b1b811..3135a5dc4f 100644
--- a/bin/tests/system/wildcard/ns1/named.conf.in
+++ b/bin/tests/system/wildcard/ns1/named.conf.in
@@ -22,19 +22,19 @@ options {
 	notify yes;
 };
 
-zone "." { type master; file "root.db.signed"; };
+zone "." { type primary; file "root.db.signed"; };
 
 /*
  * RFC 4592 example zone.
  */
-zone "example" { type master; file "example.db"; };
-zone "nsec" { type master; file "nsec.db.signed"; };
-zone "private.nsec" { type master; file "private.nsec.db.signed"; };
+zone "example" { type primary; file "example.db"; };
+zone "nsec" { type primary; file "nsec.db.signed"; };
+zone "private.nsec" { type primary; file "private.nsec.db.signed"; };
 
 /*
  * The contents of nsec3 and private.nsec3 are specially chosen to
  * have separate NSEC3 records for the "no qname proof" and the
  * "closest encloser proof".
  */
-zone "nsec3" { type master; file "nsec3.db.signed"; };
-zone "private.nsec3" { type master; file "private.nsec3.db.signed"; };
+zone "nsec3" { type primary; file "nsec3.db.signed"; };
+zone "private.nsec3" { type primary; file "private.nsec3.db.signed"; };
diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh
index f6de806024..222ba6b48f 100644
--- a/bin/tests/system/xfer/clean.sh
+++ b/bin/tests/system/xfer/clean.sh
@@ -24,12 +24,12 @@ rm -f ns*/managed-keys.bind*
 rm -f ns*/named.lock
 rm -f ns1/edns-expire.db
 rm -f ns1/ixfr-too-big.db ns1/ixfr-too-big.db.jnl
-rm -f ns1/slave.db ns2/slave.db
+rm -f ns1/sec.db ns2/sec.db
 rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl
 rm -f ns2/mapped.db
 rm -f ns3/example.bk ns3/xfer-stats.bk ns3/tsigzone.bk ns3/example.bk.jnl
 rm -f ns3/mapped.bk
-rm -f ns3/master.bk ns3/master.bk.jnl
+rm -f ns3/primary.bk ns3/primary.bk.jnl
 rm -f ns4/*.db ns4/*.jnl
 rm -f ns6/*.db ns6/*.bk ns6/*.jnl
 rm -f ns7/*.db ns7/*.bk ns7/*.jnl
diff --git a/bin/tests/system/xfer/ns1/named.conf.in b/bin/tests/system/xfer/ns1/named.conf.in
index f665f728e5..4b3156ca95 100644
--- a/bin/tests/system/xfer/ns1/named.conf.in
+++ b/bin/tests/system/xfer/ns1/named.conf.in
@@ -28,32 +28,32 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
-zone "slave" {
-	type master;
-	file "slave.db";
+zone "secondary" {
+	type primary;
+	file "sec.db";
 };
 
 zone "edns-expire" {
-	type master;
+	type primary;
 	file "edns-expire.db";
 };
 
 zone "axfr-too-big" {
-	type master;
+	type primary;
 	file "axfr-too-big.db";
 };
 
 zone "ixfr-too-big" {
-	type master;
+	type primary;
 	allow-update { any; };
 	file "ixfr-too-big.db";
 };
 
 zone "xfer-stats" {
-	type master;
+	type primary;
 	file "xfer-stats.db";
 };
diff --git a/bin/tests/system/xfer/ns2/named.conf.in b/bin/tests/system/xfer/ns2/named.conf.in
index d4021fad3c..4573ff0d6a 100644
--- a/bin/tests/system/xfer/ns2/named.conf.in
+++ b/bin/tests/system/xfer/ns2/named.conf.in
@@ -47,25 +47,25 @@ zone "." {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "tsigzone" {
-	type master;
+	type primary;
 	file "tsigzone.db";
 	allow-transfer { tzkey; };
 };
 
-zone "slave" {
-	type slave;
-	file "slave.db";
+zone "secondary" {
+	type secondary;
+	file "sec.db";
 	primaries { 10.53.0.1; };
 	masterfile-format text;
 };
 
 zone "mapped" {
-	type slave;
+	type secondary;
 	file "mapped.db";
 	masterfile-format text;
 	primaries { 10.53.0.100; };
diff --git a/bin/tests/system/xfer/ns2/slave.db.in b/bin/tests/system/xfer/ns2/sec.db.in
similarity index 100%
rename from bin/tests/system/xfer/ns2/slave.db.in
rename to bin/tests/system/xfer/ns2/sec.db.in
diff --git a/bin/tests/system/xfer/ns3/named.conf.in b/bin/tests/system/xfer/ns3/named.conf.in
index 49110b73c5..bc58e99803 100644
--- a/bin/tests/system/xfer/ns3/named.conf.in
+++ b/bin/tests/system/xfer/ns3/named.conf.in
@@ -41,15 +41,15 @@ zone "." {
 };
 
 zone "example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	file "example.bk";
 };
 
-zone "master" {
-	type slave;
+zone "primary" {
+	type secondary;
 	primaries { 10.53.0.6; };
-	file "master.bk";
+	file "primary.bk";
 };
 
 server 10.53.0.2 {
@@ -57,21 +57,21 @@ server 10.53.0.2 {
 };
 
 zone "tsigzone" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	file "tsigzone.bk";
 	allow-transfer { key tsigzone.; };
 };
 
 zone "mapped" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	masterfile-format map;
 	file "mapped.bk";
 };
 
 zone "xfer-stats" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "xfer-stats.bk";
 };
diff --git a/bin/tests/system/xfer/ns4/named.conf.base b/bin/tests/system/xfer/ns4/named.conf.base
index 14a5e0577a..cd00ccff59 100644
--- a/bin/tests/system/xfer/ns4/named.conf.base
+++ b/bin/tests/system/xfer/ns4/named.conf.base
@@ -41,6 +41,6 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/xfer/ns6/named.conf.in b/bin/tests/system/xfer/ns6/named.conf.in
index 761e96ee64..d5079f11fe 100644
--- a/bin/tests/system/xfer/ns6/named.conf.in
+++ b/bin/tests/system/xfer/ns6/named.conf.in
@@ -25,7 +25,7 @@ options {
 	listen-on-v6 { none; };
 	recursion no;
 	notify yes;
-	ixfr-from-differences master;
+	ixfr-from-differences primary;
 	check-integrity no;
 };
 
@@ -34,33 +34,33 @@ zone "." {
 	file "../../common/root.hint";
 };
 
-zone "master" {
-	type master;
-	file "master.db";
+zone "primary" {
+	type primary;
+	file "primary.db";
 };
 
-zone "slave" {
-	type slave;
+zone "secondary" {
+	type secondary;
 	notify no;
 	primaries { 10.53.0.1; };
-	file "slave.bk";
+	file "sec.bk";
 };
 
 zone "edns-expire" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "edns-expire.bk";
 };
 
 zone "axfr-too-big" {
-	type slave;
+	type secondary;
 	max-records 30;
 	primaries { 10.53.0.1; };
 	file "axfr-too-big.bk";
 };
 
 zone "ixfr-too-big" {
-	type slave;
+	type secondary;
 	max-records 30;
 	primaries { 10.53.0.1; };
 	file "ixfr-too-big.bk";
diff --git a/bin/tests/system/xfer/ns7/named.conf.in b/bin/tests/system/xfer/ns7/named.conf.in
index 9b2652cfdb..93c70b08a0 100644
--- a/bin/tests/system/xfer/ns7/named.conf.in
+++ b/bin/tests/system/xfer/ns7/named.conf.in
@@ -34,15 +34,15 @@ zone "." {
 	file "../../common/root.hint";
 };
 
-zone "master2" {
+zone "primary2" {
 	type primary;
-	file "master2.db";
+	file "primary2.db";
 };
 
-zone "slave" {
+zone "secondary" {
 	type secondary;
 	primaries { 10.53.0.1; };
-	file "slave.bk";
+	file "sec.bk";
 };
 
 zone "edns-expire" {
diff --git a/bin/tests/system/xfer/ns8/named.conf.in b/bin/tests/system/xfer/ns8/named.conf.in
index ab6e0c9878..76f2096221 100644
--- a/bin/tests/system/xfer/ns8/named.conf.in
+++ b/bin/tests/system/xfer/ns8/named.conf.in
@@ -38,7 +38,7 @@ acl tzkey {
 };
 
 zone "example." {
-	type master;
+	type primary;
 	file "example.db";
 	allow-transfer { tzkey; };
 };
diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index a2661f359b..c4b6c3a48a 100644
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -11,12 +11,12 @@
 
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 6 7 >ns1/slave.db
+$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 6 7 >ns1/sec.db
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 6 7 >ns1/edns-expire.db
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/example.db
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/tsigzone.db
-$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 6 3 >ns6/master.db
-$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 7 >ns7/master2.db
+$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 6 3 >ns6/primary.db
+$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 7 >ns7/primary2.db
 
 cp -f ns4/root.db.in ns4/root.db
 $PERL -e 'for ($i=0;$i<10000;$i++){ printf("x%u 0 in a 10.53.0.1\n", $i);}' >> ns4/root.db
@@ -30,8 +30,8 @@ copy_setports ns8/named.conf.in ns8/named.conf
 
 copy_setports ns4/named.conf.base ns4/named.conf
 
-cp ns2/slave.db.in ns2/slave.db
-touch -t 200101010000 ns2/slave.db
+cp ns2/sec.db.in ns2/sec.db
+touch -t 200101010000 ns2/sec.db
 
 cp ns2/mapped.db.in ns2/mapped.db
 
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 38acf8f1d7..d648050fba 100755
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -73,12 +73,12 @@ rndc_reload ns7 10.53.0.7
 
 sleep 2
 
-echo_i "updating master zones for ixfr-from-differences tests"
+echo_i "updating primary zones for ixfr-from-differences tests"
 
 $PERL -i -p -e '
 	s/0\.0\.0\.0/0.0.0.1/;
 	s/1397051952/1397051953/
-' ns1/slave.db
+' ns1/sec.db
 
 rndc_reload ns1 10.53.0.1
 
@@ -92,14 +92,14 @@ rndc_reload ns2 10.53.0.2
 $PERL -i -p -e '
 	s/0\.0\.0\.0/0.0.0.1/;
 	s/1397051952/1397051953/
-' ns6/master.db
+' ns6/primary.db
 
 rndc_reload ns6 10.53.0.6
 
 $PERL -i -p -e '
 	s/0\.0\.0\.0/0.0.0.1/;
 	s/1397051952/1397051953/
-' ns7/master2.db
+' ns7/primary2.db
 
 rndc_reload ns7 10.53.0.7
 
@@ -109,9 +109,9 @@ n=$((n+1))
 echo_i "testing zone is dumped after successful transfer ($n)"
 tmp=0
 $DIG $DIGOPTS +noall +answer +multi @10.53.0.2 \
-	slave. soa > dig.out.ns2.test$n || tmp=1
+	secondary. soa > dig.out.ns2.test$n || tmp=1
 grep "1397051952 ; serial" dig.out.ns2.test$n > /dev/null 2>&1 || tmp=1
-grep "1397051952 ; serial" ns2/slave.db > /dev/null 2>&1 || tmp=1
+grep "1397051952 ; serial" ns2/sec.db > /dev/null 2>&1 || tmp=1
 if test $tmp != 0 ; then echo_i "failed"; fi
 status=$((status+tmp))
 
@@ -121,9 +121,9 @@ tmp=0
 
 echo_i "wait for reloads..."
 wait_for_reloads() (
-	$DIG $DIGOPTS @10.53.0.6 +noall +answer soa master > dig.out.soa1.ns6.test$n
+	$DIG $DIGOPTS @10.53.0.6 +noall +answer soa primary > dig.out.soa1.ns6.test$n
 	grep "1397051953" dig.out.soa1.ns6.test$n > /dev/null || return 1
-	$DIG $DIGOPTS @10.53.0.1 +noall +answer soa slave  > dig.out.soa2.ns1.test$n
+	$DIG $DIGOPTS @10.53.0.1 +noall +answer soa secondary  > dig.out.soa2.ns1.test$n
 	grep "1397051953" dig.out.soa2.ns1.test$n > /dev/null || return 1
 	$DIG $DIGOPTS @10.53.0.2 +noall +answer soa example > dig.out.soa3.ns2.test$n
 	grep "1397051953" dig.out.soa3.ns2.test$n > /dev/null || return 1
@@ -136,15 +136,15 @@ wait_for_transfers() (
 	a=0 b=0 c=0 d=0
 	$DIG $DIGOPTS @10.53.0.3 +noall +answer soa example > dig.out.soa1.ns3.test$n
 	grep "1397051953" dig.out.soa1.ns3.test$n > /dev/null && a=1
-	$DIG $DIGOPTS @10.53.0.3 +noall +answer soa master > dig.out.soa2.ns3.test$n
+	$DIG $DIGOPTS @10.53.0.3 +noall +answer soa primary > dig.out.soa2.ns3.test$n
 	grep "1397051953" dig.out.soa2.ns3.test$n > /dev/null && b=1
-	$DIG $DIGOPTS @10.53.0.6 +noall +answer soa slave  > dig.out.soa3.ns6.test$n
+	$DIG $DIGOPTS @10.53.0.6 +noall +answer soa secondary > dig.out.soa3.ns6.test$n
 	grep "1397051953" dig.out.soa3.ns6.test$n > /dev/null && c=1
 	[ $a -eq 1 -a $b -eq 1 -a $c -eq 1 ] && return 0
 
 	# re-notify if necessary
-	$RNDCCMD 10.53.0.6 notify master 2>&1 | sed 's/^/ns6 /' | cat_i
-	$RNDCCMD 10.53.0.1 notify slave 2>&1 | sed 's/^/ns1 /' | cat_i
+	$RNDCCMD 10.53.0.6 notify primary 2>&1 | sed 's/^/ns6 /' | cat_i
+	$RNDCCMD 10.53.0.1 notify secondary 2>&1 | sed 's/^/ns1 /' | cat_i
 	$RNDCCMD 10.53.0.2 notify example 2>&1 | sed 's/^/ns2 /' | cat_i
 	return 1
 )
@@ -164,43 +164,43 @@ if test $tmp != 0 ; then echo_i "failed"; fi
 status=$((status+tmp))
 
 n=$((n+1))
-echo_i "testing ixfr-from-differences master; (master zone) ($n)"
+echo_i "testing ixfr-from-differences primary; (primary zone) ($n)"
 tmp=0
 
-$DIG $DIGOPTS master. \
+$DIG $DIGOPTS primary. \
 	@10.53.0.6 axfr > dig.out.ns6.test$n || tmp=1
 grep "^;" dig.out.ns6.test$n | cat_i
 
-$DIG $DIGOPTS master. \
+$DIG $DIGOPTS primary. \
 	@10.53.0.3 axfr > dig.out.ns3.test$n || tmp=1
 grep "^;" dig.out.ns3.test$n > /dev/null && cat_i dig.out.ns3.test$n
 
 digcomp dig.out.ns6.test$n dig.out.ns3.test$n || tmp=1
 
 # ns3 has a journal iff it received an IXFR.
-test -f ns3/master.bk || tmp=1
-test -f ns3/master.bk.jnl || tmp=1
+test -f ns3/primary.bk || tmp=1
+test -f ns3/primary.bk.jnl || tmp=1
 
 if test $tmp != 0 ; then echo_i "failed"; fi
 status=$((status+tmp))
 
 n=$((n+1))
-echo_i "testing ixfr-from-differences master; (secondary zone) ($n)"
+echo_i "testing ixfr-from-differences primary; (secondary zone) ($n)"
 tmp=0
 
-$DIG $DIGOPTS slave. \
+$DIG $DIGOPTS secondary. \
 	@10.53.0.6 axfr > dig.out.ns6.test$n || tmp=1
 grep "^;" dig.out.ns6.test$n | cat_i
 
-$DIG $DIGOPTS slave. \
+$DIG $DIGOPTS secondary. \
 	@10.53.0.1 axfr > dig.out.ns1.test$n || tmp=1
 grep "^;" dig.out.ns1.test$n | cat_i
 
 digcomp dig.out.ns6.test$n dig.out.ns1.test$n || tmp=1
 
 # ns6 has a journal iff it received an IXFR.
-test -f ns6/slave.bk || tmp=1
-test -f ns6/slave.bk.jnl && tmp=1
+test -f ns6/sec.bk || tmp=1
+test -f ns6/sec.bk.jnl && tmp=1
 
 if test $tmp != 0 ; then echo_i "failed"; fi
 status=$((status+tmp))
@@ -210,8 +210,8 @@ echo_i "testing ixfr-from-differences secondary; (secondary zone) ($n)"
 tmp=0
 
 # ns7 has a journal iff it generates an IXFR.
-test -f ns7/master2.db || tmp=1
-test -f ns7/master2.db.jnl && tmp=1
+test -f ns7/primary2.db || tmp=1
+test -f ns7/primary2.db.jnl && tmp=1
 
 if test $tmp != 0 ; then echo_i "failed"; fi
 status=$((status+tmp))
@@ -220,19 +220,19 @@ n=$((n+1))
 echo_i "testing ixfr-from-differences secondary; (secondary zone) ($n)"
 tmp=0
 
-$DIG $DIGOPTS slave. \
+$DIG $DIGOPTS secondary. \
 	@10.53.0.1 axfr > dig.out.ns1.test$n || tmp=1
 grep "^;" dig.out.ns1.test$n | cat_i
 
-$DIG $DIGOPTS slave. \
+$DIG $DIGOPTS secondary. \
 	@10.53.0.7 axfr > dig.out.ns7.test$n || tmp=1
 grep "^;" dig.out.ns7.test$n | cat_i
 
 digcomp dig.out.ns7.test$n dig.out.ns1.test$n || tmp=1
 
 # ns7 has a journal iff it generates an IXFR.
-test -f ns7/slave.bk || tmp=1
-test -f ns7/slave.bk.jnl || tmp=1
+test -f ns7/sec.bk || tmp=1
+test -f ns7/sec.bk.jnl || tmp=1
 
 if test $tmp != 0 ; then echo_i "failed"; fi
 status=$((status+tmp))
@@ -267,7 +267,7 @@ cat <<EOF >>ns4/named.conf
 zone "nil" {
 	type secondary;
 	file "nil.db";
-	masters { 10.53.0.5 key tsig_key; };
+	primaries { 10.53.0.5 key tsig_key; };
 };
 EOF
 
diff --git a/bin/tests/system/xferquota/ns1/named.conf.in b/bin/tests/system/xferquota/ns1/named.conf.in
index 290778e0b3..e42a821f62 100644
--- a/bin/tests/system/xferquota/ns1/named.conf.in
+++ b/bin/tests/system/xferquota/ns1/named.conf.in
@@ -31,12 +31,12 @@ controls {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
 
 zone "changing." {
-	type master;
+	type primary;
 	file "changing.db";
 };
 
diff --git a/bin/tests/system/xferquota/ns2/named.conf.in b/bin/tests/system/xferquota/ns2/named.conf.in
index 5c1efdc710..99a6a0d5f1 100644
--- a/bin/tests/system/xferquota/ns2/named.conf.in
+++ b/bin/tests/system/xferquota/ns2/named.conf.in
@@ -30,7 +30,7 @@ zone "." {
 };
 
 zone "changing." {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.1; };
 	file "changing.bk";
 };
diff --git a/bin/tests/system/xferquota/setup.pl b/bin/tests/system/xferquota/setup.pl
index 6acbb73657..38d331e5bf 100644
--- a/bin/tests/system/xferquota/setup.pl
+++ b/bin/tests/system/xferquota/setup.pl
@@ -14,13 +14,13 @@
 #
 use FileHandle;
 
-my $masterconf = new FileHandle("ns1/zones.conf", "w") or die;
-my $slaveconf  = new FileHandle("ns2/zones.conf", "w") or die;
+my $priconf = new FileHandle("ns1/zones.conf", "w") or die;
+my $secconf  = new FileHandle("ns2/zones.conf", "w") or die;
 
 for ($z = 0; $z < 300; $z++) {
     my $zn = sprintf("zone%06d.example", $z);
-    print $masterconf "zone \"$zn\" { type master; file \"$zn.db\"; };\n";
-    print $slaveconf  "zone \"$zn\" { type slave; file \"$zn.bk\"; masterfile-format text; masters { 10.53.0.1; }; };\n";
+    print $priconf "zone \"$zn\" { type primary; file \"$zn.db\"; };\n";
+    print $secconf  "zone \"$zn\" { type secondary; file \"$zn.bk\"; masterfile-format text; primaries { 10.53.0.1; }; };\n";
     my $fn = "ns1/$zn.db";
     my $f = new FileHandle($fn, "w") or die "open: $fn: $!";
     print $f "\$TTL 300
diff --git a/bin/tests/system/zero/ns1/named.conf.in b/bin/tests/system/zero/ns1/named.conf.in
index f5ae6ee4fd..e32d149c34 100644
--- a/bin/tests/system/zero/ns1/named.conf.in
+++ b/bin/tests/system/zero/ns1/named.conf.in
@@ -22,6 +22,6 @@ options {
 };
 
 zone "." {
-	type master;
+	type primary;
 	file "root.db";
 };
diff --git a/bin/tests/system/zero/ns2/named.conf.in b/bin/tests/system/zero/ns2/named.conf.in
index 671efcc6fe..ad0e62b3e0 100644
--- a/bin/tests/system/zero/ns2/named.conf.in
+++ b/bin/tests/system/zero/ns2/named.conf.in
@@ -22,11 +22,11 @@ options {
 };
 
 zone "example" {
-	type master;
+	type primary;
 	file "example.db";
 };
 
 zone "tld" {
-	type master;
+	type primary;
 	file "tld.db";
 };
diff --git a/bin/tests/system/zero/ns4/named.conf.in b/bin/tests/system/zero/ns4/named.conf.in
index 0b81bca415..39574abff0 100644
--- a/bin/tests/system/zero/ns4/named.conf.in
+++ b/bin/tests/system/zero/ns4/named.conf.in
@@ -22,12 +22,12 @@ options {
 };
 
 zone "example" {
-	type slave;
+	type secondary;
 	primaries { 10.53.0.2; };
 	file "example.bk";
 };
 
 zone "one.tld" {
-	type master;
+	type primary;
 	file "one.tld.db";
 };
diff --git a/bin/tests/system/zonechecks/ns1/named.conf.in b/bin/tests/system/zonechecks/ns1/named.conf.in
index 719535d786..29dcbf4787 100644
--- a/bin/tests/system/zonechecks/ns1/named.conf.in
+++ b/bin/tests/system/zonechecks/ns1/named.conf.in
@@ -37,7 +37,7 @@ view unused {
 	match-clients { none; };
 
 	zone "duplicate.example" {
-		type master;
+		type primary;
 		file "duplicate.db";
 	};
 };
@@ -45,26 +45,26 @@ view unused {
 view primary {
 	match-clients { any; };
 
-	zone "master.example" {
+	zone "primary.example" {
 		type primary;
-		file "master.db";
+		file "primary.db";
 		allow-update { any; };
 		allow-transfer { any; };
 		auto-dnssec maintain;
 	};
 
 	zone "bigserial.example" {
-		type master;
+		type primary;
 		file "bigserial.db";
 	};
 
 	zone "reload.example" {
-		type master;
+		type primary;
 		file "reload.db";
 	};
 
 	zone "duplicate.example" {
-		type master;
+		type primary;
 		file "duplicate.db";
 	};
 };
diff --git a/bin/tests/system/zonechecks/ns2/named.conf.in b/bin/tests/system/zonechecks/ns2/named.conf.in
index ef878a6002..97176f8b8a 100644
--- a/bin/tests/system/zonechecks/ns2/named.conf.in
+++ b/bin/tests/system/zonechecks/ns2/named.conf.in
@@ -33,8 +33,8 @@ controls {
 	inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
-zone "master.example" {
+zone "primary.example" {
 	type secondary;
 	primaries { 10.53.0.1; };
-	file "slave.db";
+	file "sec.db";
 };
diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh
index d704d7db75..732e95d00f 100644
--- a/bin/tests/system/zonechecks/setup.sh
+++ b/bin/tests/system/zonechecks/setup.sh
@@ -16,15 +16,15 @@ $SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
 
-$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/master.db
+$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/primary.db
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/duplicate.db
 cp bigserial.db ns1/
 cd ns1
-touch master.db.signed
-echo '$INCLUDE "master.db.signed"' >> master.db
-$KEYGEN -a rsasha256 -q master.example > /dev/null 2>&1
-$KEYGEN -a rsasha256 -qfk master.example > /dev/null 2>&1
-$SIGNER -SD -o master.example master.db > /dev/null \
+touch primary.db.signed
+echo '$INCLUDE "primary.db.signed"' >> primary.db
+$KEYGEN -a rsasha256 -q primary.example > /dev/null 2>&1
+$KEYGEN -a rsasha256 -qfk primary.example > /dev/null 2>&1
+$SIGNER -SD -o primary.example primary.db > /dev/null \
     2> signer.err || cat signer.err
 echo '$INCLUDE "soa.db"' > reload.db
 echo '@ 0 NS .' >> reload.db
diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh
index b8fcb08ddd..20261f273e 100644
--- a/bin/tests/system/zonechecks/tests.sh
+++ b/bin/tests/system/zonechecks/tests.sh
@@ -161,8 +161,8 @@ echo_i "checking 'rdnc zonestatus' output"
 ret=0 
 for i in 0 1 2 3 4 5 6 7 8 9
 do
-	$RNDCCMD 10.53.0.1 zonestatus master.example > rndc.out.master 2>&1
-	grep "zone not loaded" rndc.out.master > /dev/null || break
+	$RNDCCMD 10.53.0.1 zonestatus primary.example > rndc.out.pri 2>&1
+	grep "zone not loaded" rndc.out.pri > /dev/null || break
 	sleep 1
 done
 checkfor() {
@@ -171,34 +171,34 @@ checkfor() {
 		echo_i "missing string '$1' from '$2'"
 	}
 }
-checkfor "name: master.example" rndc.out.master
-checkfor "type: master" rndc.out.master
-checkfor "files: master.db, master.db.signed" rndc.out.master
-checkfor "serial: " rndc.out.master
-checkfor "nodes: " rndc.out.master
-checkfor "last loaded: " rndc.out.master
-checkfor "secure: yes" rndc.out.master
-checkfor "inline signing: no" rndc.out.master
-checkfor "key maintenance: automatic" rndc.out.master
-checkfor "next key event: " rndc.out.master
-checkfor "next resign node: " rndc.out.master
-checkfor "next resign time: " rndc.out.master
-checkfor "dynamic: yes" rndc.out.master
-checkfor "frozen: no" rndc.out.master
+checkfor "name: primary.example" rndc.out.pri
+checkfor "type: primary" rndc.out.pri
+checkfor "files: primary.db, primary.db.signed" rndc.out.pri
+checkfor "serial: " rndc.out.pri
+checkfor "nodes: " rndc.out.pri
+checkfor "last loaded: " rndc.out.pri
+checkfor "secure: yes" rndc.out.pri
+checkfor "inline signing: no" rndc.out.pri
+checkfor "key maintenance: automatic" rndc.out.pri
+checkfor "next key event: " rndc.out.pri
+checkfor "next resign node: " rndc.out.pri
+checkfor "next resign time: " rndc.out.pri
+checkfor "dynamic: yes" rndc.out.pri
+checkfor "frozen: no" rndc.out.pri
 for i in 0 1 2 3 4 5 6 7 8 9
 do
-	$RNDCCMD 10.53.0.2 zonestatus master.example > rndc.out.slave 2>&1
-	grep "zone not loaded" rndc.out.slave > /dev/null || break
+	$RNDCCMD 10.53.0.2 zonestatus primary.example > rndc.out.sec 2>&1
+	grep "zone not loaded" rndc.out.sec > /dev/null || break
 	sleep 1
 done
-checkfor "name: master.example" rndc.out.slave
-checkfor "type: slave" rndc.out.slave
-checkfor "files: slave.db" rndc.out.slave
-checkfor "serial: " rndc.out.slave
-checkfor "nodes: " rndc.out.slave
-checkfor "next refresh: " rndc.out.slave
-checkfor "expires: " rndc.out.slave
-checkfor "secure: yes" rndc.out.slave
+checkfor "name: primary.example" rndc.out.sec
+checkfor "type: secondary" rndc.out.sec
+checkfor "files: sec.db" rndc.out.sec
+checkfor "serial: " rndc.out.sec
+checkfor "nodes: " rndc.out.sec
+checkfor "next refresh: " rndc.out.sec
+checkfor "expires: " rndc.out.sec
+checkfor "secure: yes" rndc.out.sec
 for i in 0 1 2 3 4 5 6 7 8 9
 do
 	$RNDCCMD 10.53.0.1 zonestatus reload.example > rndc.out.prereload 2>&1