diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index 794160e04b..bd2733b69a 100644
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -655,7 +655,7 @@ load_zone(isc_mem_t *mctx, const char *zonename, const char *filename,
 	isc_buffer_constinit(&buffer, zonename, strlen(zonename));
 	isc_buffer_add(&buffer, strlen(zonename));
 	origin = dns_fixedname_initname(&fixorigin);
-	CHECK(dns_name_fromtext(origin, &buffer, dns_rootname, 0, NULL));
+	CHECK(dns_name_fromtext(origin, &buffer, dns_rootname, 0));
 	dns_zone_setorigin(zone, origin);
 	dns_zone_setdbtype(zone, 1, (const char *const *)dbtype);
 	if (strcmp(filename, "-") == 0) {
diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index 2088088d46..1d63d143fd 100644
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -597,7 +597,7 @@ convert_name(dns_fixedname_t *fn, dns_name_t **name, const char *text) {
 	isc_buffer_add(&b, len);
 	n = dns_fixedname_initname(fn);
 
-	result = dns_name_fromtext(n, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(n, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		delv_log(ISC_LOG_ERROR, "failed to convert name %s: %s", text,
 			 isc_result_totext(result));
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 2f43fb6998..69a310d2f3 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -882,7 +882,7 @@ setup_text_key(void) {
 		goto failure;
 	}
 
-	result = dns_name_fromtext(keyname, namebuf, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(keyname, namebuf, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		goto failure;
 	}
@@ -2252,8 +2252,7 @@ setup_lookup(dig_lookup_t *lookup) {
 		len = (unsigned int)strlen(origin);
 		isc_buffer_init(&b, origin, len);
 		isc_buffer_add(&b, len);
-		result = dns_name_fromtext(lookup->oname, &b, dns_rootname, 0,
-					   NULL);
+		result = dns_name_fromtext(lookup->oname, &b, dns_rootname, 0);
 		if (result != ISC_R_SUCCESS) {
 			dns_message_puttempname(lookup->sendmsg, &lookup->name);
 			dns_message_puttempname(lookup->sendmsg,
@@ -2271,7 +2270,7 @@ setup_lookup(dig_lookup_t *lookup) {
 			len = (unsigned int)strlen(textname);
 			isc_buffer_init(&b, textname, len);
 			isc_buffer_add(&b, len);
-			result = dns_name_fromtext(name, &b, NULL, 0, NULL);
+			result = dns_name_fromtext(name, &b, NULL, 0);
 			if (result == ISC_R_SUCCESS) {
 				if (!dns_name_isabsolute(name)) {
 					result = dns_name_concatenate(
@@ -2304,7 +2303,7 @@ setup_lookup(dig_lookup_t *lookup) {
 			isc_buffer_init(&b, textname, len);
 			isc_buffer_add(&b, len);
 			result = dns_name_fromtext(lookup->name, &b,
-						   dns_rootname, 0, NULL);
+						   dns_rootname, 0);
 			if (result != ISC_R_SUCCESS) {
 				dns_message_puttempname(lookup->sendmsg,
 							&lookup->name);
diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c
index fbf319c356..13368126ef 100644
--- a/bin/dnssec/dnssec-cds.c
+++ b/bin/dnssec/dnssec-cds.c
@@ -178,7 +178,7 @@ initname(char *setname) {
 
 	isc_buffer_init(&buf, setname, strlen(setname));
 	isc_buffer_add(&buf, strlen(setname));
-	result = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &buf, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		fatal("could not initialize name %s", setname);
 	}
diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
index 00c1bab86e..9647638eac 100644
--- a/bin/dnssec/dnssec-dsfromkey.c
+++ b/bin/dnssec/dnssec-dsfromkey.c
@@ -67,7 +67,7 @@ initname(char *setname) {
 
 	isc_buffer_init(&buf, setname, strlen(setname));
 	isc_buffer_add(&buf, strlen(setname));
-	result = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &buf, dns_rootname, 0);
 	return result;
 }
 
diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c
index 95ac0256ba..3d5ca6724e 100644
--- a/bin/dnssec/dnssec-importkey.c
+++ b/bin/dnssec/dnssec-importkey.c
@@ -69,7 +69,7 @@ initname(char *setname) {
 
 	isc_buffer_init(&buf, setname, strlen(setname));
 	isc_buffer_add(&buf, strlen(setname));
-	result = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &buf, dns_rootname, 0);
 	return result;
 }
 
diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c
index 3b8899960b..dadf6e0c9b 100644
--- a/bin/dnssec/dnssec-keyfromlabel.c
+++ b/bin/dnssec/dnssec-keyfromlabel.c
@@ -367,7 +367,7 @@ main(int argc, char **argv) {
 		isc_buffer_init(&buf, argv[isc_commandline_index],
 				strlen(argv[isc_commandline_index]));
 		isc_buffer_add(&buf, strlen(argv[isc_commandline_index]));
-		ret = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL);
+		ret = dns_name_fromtext(name, &buf, dns_rootname, 0);
 		if (ret != ISC_R_SUCCESS) {
 			fatal("invalid key name %s: %s",
 			      argv[isc_commandline_index],
diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 36ed720ec8..e04f73bd11 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -277,7 +277,7 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) {
 		isc_buffer_init(&buf, argv[isc_commandline_index],
 				strlen(argv[isc_commandline_index]));
 		isc_buffer_add(&buf, strlen(argv[isc_commandline_index]));
-		ret = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL);
+		ret = dns_name_fromtext(name, &buf, dns_rootname, 0);
 		if (ret != ISC_R_SUCCESS) {
 			fatal("invalid key name %s: %s",
 			      argv[isc_commandline_index],
diff --git a/bin/dnssec/dnssec-ksr.c b/bin/dnssec/dnssec-ksr.c
index 95b1e4b7e5..3260e3ff64 100644
--- a/bin/dnssec/dnssec-ksr.c
+++ b/bin/dnssec/dnssec-ksr.c
@@ -1008,7 +1008,7 @@ parse_dnskey(isc_lex_t *lex, char *owner, isc_buffer_t *buf, dns_ttl_t *ttl) {
 	dname = dns_fixedname_initname(&dfname);
 	isc_buffer_init(&b, owner, strlen(owner));
 	isc_buffer_add(&b, strlen(owner));
-	ret = dns_name_fromtext(dname, &b, dns_rootname, 0, NULL);
+	ret = dns_name_fromtext(dname, &b, dns_rootname, 0);
 	if (ret != ISC_R_SUCCESS) {
 		return ret;
 	}
@@ -1455,7 +1455,7 @@ main(int argc, char *argv[]) {
 	name = dns_fixedname_initname(&fname);
 	isc_buffer_init(&buf, argv[1], strlen(argv[1]));
 	isc_buffer_add(&buf, strlen(argv[1]));
-	ret = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL);
+	ret = dns_name_fromtext(name, &buf, dns_rootname, 0);
 	if (ret != ISC_R_SUCCESS) {
 		fatal("invalid zone name %s: %s", argv[1],
 		      isc_result_totext(ret));
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 7ef9236dff..9101098470 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -2579,7 +2579,7 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) {
 	isc_buffer_add(&b, len);
 
 	name = dns_fixedname_initname(&fname);
-	result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		fatal("failed converting name '%s' to dns format: %s", origin,
 		      isc_result_totext(result));
diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c
index 14a19277b0..1b00812c64 100644
--- a/bin/dnssec/dnssec-verify.c
+++ b/bin/dnssec/dnssec-verify.c
@@ -105,7 +105,7 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) {
 	isc_buffer_add(&b, len);
 
 	name = dns_fixedname_initname(&fname);
-	result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		fatal("failed converting name '%s' to dns format: %s", origin,
 		      isc_result_totext(result));
diff --git a/bin/named/config.c b/bin/named/config.c
index 5da15a526c..3ac41a80b2 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -558,7 +558,7 @@ named_config_getname(isc_mem_t *mctx, const cfg_obj_t *obj,
 	isc_buffer_add(&b, strlen(objstr));
 	dns_fixedname_init(&fname);
 	result = dns_name_fromtext(dns_fixedname_name(&fname), &b, dns_rootname,
-				   0, NULL);
+				   0);
 	if (result != ISC_R_SUCCESS) {
 		isc_mem_put(mctx, *namep, sizeof(**namep));
 		*namep = NULL;
diff --git a/bin/named/server.c b/bin/named/server.c
index 9f6d021bbf..236eadf612 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -664,7 +664,7 @@ configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config,
 		str = cfg_obj_asstring(nameobj);
 		isc_buffer_constinit(&b, str, strlen(str));
 		isc_buffer_add(&b, strlen(str));
-		CHECK(dns_name_fromtext(name, &b, dns_rootname, 0, NULL));
+		CHECK(dns_name_fromtext(name, &b, dns_rootname, 0));
 		result = dns_nametree_add(*ntp, name, true);
 		if (result != ISC_R_SUCCESS) {
 			cfg_obj_log(nameobj, ISC_LOG_ERROR,
@@ -724,7 +724,7 @@ ta_fromconfig(const cfg_obj_t *key, bool *initialp, const char **namestrp,
 	name = dns_fixedname_initname(&fname);
 	isc_buffer_constinit(&namebuf, namestr, strlen(namestr));
 	isc_buffer_add(&namebuf, strlen(namestr));
-	CHECK(dns_name_fromtext(name, &namebuf, dns_rootname, 0, NULL));
+	CHECK(dns_name_fromtext(name, &namebuf, dns_rootname, 0));
 
 	if (*initialp) {
 		atstr = cfg_obj_asstring(cfg_tuple_get(key, "anchortype"));
@@ -913,7 +913,7 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots,
 		isc_buffer_constinit(&b, namestr, strlen(namestr));
 		isc_buffer_add(&b, strlen(namestr));
 		keyname = dns_fixedname_initname(&fkeyname);
-		result = dns_name_fromtext(keyname, &b, dns_rootname, 0, NULL);
+		result = dns_name_fromtext(keyname, &b, dns_rootname, 0);
 		if (result != ISC_R_SUCCESS) {
 			return result;
 		}
@@ -1306,7 +1306,7 @@ configure_order(dns_order_t *order, const cfg_obj_t *ent) {
 	isc_buffer_add(&b, strlen(str));
 	dns_fixedname_init(&fixed);
 	result = dns_name_fromtext(dns_fixedname_name(&fixed), &b, dns_rootname,
-				   0, NULL);
+				   0);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
@@ -1591,7 +1591,7 @@ disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
 	str = cfg_obj_asstring(cfg_tuple_get(disabled, "name"));
 	isc_buffer_constinit(&b, str, strlen(str));
 	isc_buffer_add(&b, strlen(str));
-	CHECK(dns_name_fromtext(name, &b, dns_rootname, 0, NULL));
+	CHECK(dns_name_fromtext(name, &b, dns_rootname, 0));
 
 	algorithms = cfg_tuple_get(disabled, "algorithms");
 	for (element = cfg_list_first(algorithms); element != NULL;
@@ -1634,7 +1634,7 @@ disable_ds_digests(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
 	str = cfg_obj_asstring(cfg_tuple_get(disabled, "name"));
 	isc_buffer_constinit(&b, str, strlen(str));
 	isc_buffer_add(&b, strlen(str));
-	CHECK(dns_name_fromtext(name, &b, dns_rootname, 0, NULL));
+	CHECK(dns_name_fromtext(name, &b, dns_rootname, 0));
 
 	digests = cfg_tuple_get(disabled, "digests");
 	for (element = cfg_list_first(digests); element != NULL;
@@ -1678,7 +1678,7 @@ on_disable_list(const cfg_obj_t *disablelist, dns_name_t *zonename) {
 		str = cfg_obj_asstring(value);
 		isc_buffer_constinit(&b, str, strlen(str));
 		isc_buffer_add(&b, strlen(str));
-		result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+		result = dns_name_fromtext(name, &b, dns_rootname, 0);
 		RUNTIME_CHECK(result == ISC_R_SUCCESS);
 		if (dns_name_equal(name, zonename)) {
 			return true;
@@ -1861,7 +1861,7 @@ dns64_reverse(dns_view_t *view, isc_mem_t *mctx, isc_netaddr_t *na,
 	name = dns_fixedname_initname(&fixed);
 	isc_buffer_constinit(&b, reverse, strlen(reverse));
 	isc_buffer_add(&b, strlen(reverse));
-	CHECK(dns_name_fromtext(name, &b, dns_rootname, 0, NULL));
+	CHECK(dns_name_fromtext(name, &b, dns_rootname, 0));
 	dns_zone_create(&zone, mctx, 0);
 	dns_zone_setorigin(zone, name);
 	dns_zone_setview(zone, view);
@@ -5876,8 +5876,8 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view,
 			isc_buffer_constinit(&buffer, str, strlen(str));
 			isc_buffer_add(&buffer, strlen(str));
 			name = dns_fixedname_initname(&fixed);
-			CHECK(dns_name_fromtext(name, &buffer, dns_rootname, 0,
-						NULL));
+			CHECK(dns_name_fromtext(name, &buffer, dns_rootname,
+						0));
 
 			portobj = cfg_tuple_get(alternate, "port");
 			if (cfg_obj_isuint32(portobj)) {
@@ -6232,7 +6232,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
 	isc_buffer_add(&buffer, strlen(zname));
 	dns_fixedname_init(&fixorigin);
 	CHECK(dns_name_fromtext(dns_fixedname_name(&fixorigin), &buffer,
-				dns_rootname, 0, NULL));
+				dns_rootname, 0));
 	origin = dns_fixedname_name(&fixorigin);
 
 	CHECK(named_config_getclass(cfg_tuple_get(zconfig, "class"),
@@ -7243,7 +7243,7 @@ configure_session_key(const cfg_obj_t **maps, named_server_t *server,
 	isc_buffer_constinit(&buffer, keynamestr, strlen(keynamestr));
 	isc_buffer_add(&buffer, strlen(keynamestr));
 	keyname = dns_fixedname_initname(&fname);
-	result = dns_name_fromtext(keyname, &buffer, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(keyname, &buffer, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
@@ -7801,8 +7801,7 @@ get_newzone_config(dns_view_t *view, const char *zonename,
 	isc_buffer_constinit(&b, zonename, strlen(zonename));
 	isc_buffer_add(&b, strlen(zonename));
 	name = dns_fixedname_initname(&fname);
-	CHECK(dns_name_fromtext(name, &b, dns_rootname, DNS_NAME_DOWNCASE,
-				NULL));
+	CHECK(dns_name_fromtext(name, &b, dns_rootname, DNS_NAME_DOWNCASE));
 	dns_name_format(name, zname, sizeof(zname));
 
 	key.mv_data = zname;
@@ -11833,7 +11832,7 @@ named_server_flushnode(named_server_t *server, isc_lex_t *lex, bool tree) {
 	isc_buffer_constinit(&b, target, strlen(target));
 	isc_buffer_add(&b, strlen(target));
 	name = dns_fixedname_initname(&fixed);
-	result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
@@ -12943,7 +12942,7 @@ load_nzf(dns_view_t *view, ns_cfgctx_t *nzcfg) {
 		isc_buffer_add(&b, strlen(origin));
 		name = dns_fixedname_initname(&fname);
 		CHECK(dns_name_fromtext(name, &b, dns_rootname,
-					DNS_NAME_DOWNCASE, NULL));
+					DNS_NAME_DOWNCASE));
 		dns_name_format(name, zname, sizeof(zname));
 
 		key.mv_data = zname;
@@ -13652,7 +13651,7 @@ named_server_changezone(named_server_t *server, char *command,
 	isc_buffer_add(&buf, strlen(zonename));
 
 	dnsname = dns_fixedname_initname(&fname);
-	CHECK(dns_name_fromtext(dnsname, &buf, dns_rootname, 0, NULL));
+	CHECK(dns_name_fromtext(dnsname, &buf, dns_rootname, 0));
 
 	if (redirect) {
 		if (!dns_name_equal(dnsname, dns_rootname)) {
@@ -15218,7 +15217,7 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly,
 		isc_buffer_t b;
 		isc_buffer_init(&b, namebuf, strlen(namebuf));
 		isc_buffer_add(&b, strlen(namebuf));
-		CHECK(dns_name_fromtext(fname, &b, dns_rootname, 0, NULL));
+		CHECK(dns_name_fromtext(fname, &b, dns_rootname, 0));
 		ntaname = fname;
 	}
 
diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c
index 28beca3085..569a7873e9 100644
--- a/bin/named/tkeyconf.c
+++ b/bin/named/tkeyconf.c
@@ -62,7 +62,7 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx,
 		isc_buffer_constinit(&b, s, strlen(s));
 		isc_buffer_add(&b, strlen(s));
 		name = dns_fixedname_initname(&fname);
-		RETERR(dns_name_fromtext(name, &b, dns_rootname, 0, NULL));
+		RETERR(dns_name_fromtext(name, &b, dns_rootname, 0));
 		tctx->domain = isc_mem_get(mctx, sizeof(dns_name_t));
 		dns_name_init(tctx->domain);
 		dns_name_dup(name, mctx, tctx->domain);
@@ -76,7 +76,7 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx,
 		isc_buffer_constinit(&b, s, strlen(s));
 		isc_buffer_add(&b, strlen(s));
 		name = dns_fixedname_initname(&fname);
-		RETERR(dns_name_fromtext(name, &b, dns_rootname, 0, NULL));
+		RETERR(dns_name_fromtext(name, &b, dns_rootname, 0));
 		RETERR(dst_gssapi_acquirecred(name, false, &tctx->gsscred));
 	}
 
diff --git a/bin/named/transportconf.c b/bin/named/transportconf.c
index cfef81068a..5b904761ec 100644
--- a/bin/named/transportconf.c
+++ b/bin/named/transportconf.c
@@ -34,7 +34,7 @@
 	isc_buffer_constinit(&namesrc, id, strlen(id));           \
 	isc_buffer_add(&namesrc, strlen(id));                     \
 	result = (dns_name_fromtext(name, &namesrc, dns_rootname, \
-				    DNS_NAME_DOWNCASE, NULL));    \
+				    DNS_NAME_DOWNCASE));          \
 	if (result != ISC_R_SUCCESS) {                            \
 		goto failure;                                     \
 	}
diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c
index a51cdb87d3..aa8be9dbae 100644
--- a/bin/named/tsigconf.c
+++ b/bin/named/tsigconf.c
@@ -71,7 +71,7 @@ add_initial_keys(const cfg_obj_t *list, dns_tsigkeyring_t *ring,
 		isc_buffer_constinit(&keynamesrc, keyid, strlen(keyid));
 		isc_buffer_add(&keynamesrc, strlen(keyid));
 		ret = dns_name_fromtext(keyname, &keynamesrc, dns_rootname,
-					DNS_NAME_DOWNCASE, NULL);
+					DNS_NAME_DOWNCASE);
 		if (ret != ISC_R_SUCCESS) {
 			goto failure;
 		}
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 1b1e8a818a..9b2dd18a76 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -253,7 +253,7 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
 		isc_buffer_constinit(&b, str, strlen(str));
 		isc_buffer_add(&b, strlen(str));
 		result = dns_name_fromtext(dns_fixedname_name(&fident), &b,
-					   dns_rootname, 0, NULL);
+					   dns_rootname, 0);
 		if (result != ISC_R_SUCCESS) {
 			cfg_obj_log(identity, ISC_LOG_ERROR,
 				    "'%s' is not a valid name", str);
@@ -283,7 +283,7 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
 			isc_buffer_constinit(&b, str, strlen(str));
 			isc_buffer_add(&b, strlen(str));
 			result = dns_name_fromtext(dns_fixedname_name(&fname),
-						   &b, dns_rootname, 0, NULL);
+						   &b, dns_rootname, 0);
 			if (result != ISC_R_SUCCESS) {
 				cfg_obj_log(identity, ISC_LOG_ERROR,
 					    "'%s' is not a valid name", str);
@@ -518,7 +518,7 @@ configure_staticstub_servernames(const cfg_obj_t *zconfig, dns_zone_t *zone,
 
 		isc_buffer_constinit(&b, str, strlen(str));
 		isc_buffer_add(&b, strlen(str));
-		result = dns_name_fromtext(nsname, &b, dns_rootname, 0, NULL);
+		result = dns_name_fromtext(nsname, &b, dns_rootname, 0);
 		if (result != ISC_R_SUCCESS) {
 			cfg_obj_log(zconfig, ISC_LOG_ERROR,
 				    "server-name '%s' is not a valid "
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 8d86955828..f09c74db0b 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -523,8 +523,7 @@ setup_keystr(void) {
 	isc_buffer_add(&keynamesrc, (unsigned int)(n - name));
 
 	debug("namefromtext");
-	result = dns_name_fromtext(mykeyname, &keynamesrc, dns_rootname, 0,
-				   NULL);
+	result = dns_name_fromtext(mykeyname, &keynamesrc, dns_rootname, 0);
 	check_result(result, "dns_name_fromtext");
 
 	secretlen = strlen(secretstr) * 3 / 4;
@@ -793,7 +792,7 @@ create_name(const char *str, dns_name_t *name) {
 	isc_buffer_add(&namesrc, strlen(str));
 
 	return dns_name_fromtext(name, &namesrc, dns_rootname,
-				 DNS_NAME_DOWNCASE, NULL);
+				 DNS_NAME_DOWNCASE);
 }
 
 static void
@@ -1305,7 +1304,7 @@ parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) {
 	dns_message_gettempname(msg, namep);
 	isc_buffer_init(&source, word, strlen(word));
 	isc_buffer_add(&source, strlen(word));
-	result = dns_name_fromtext(*namep, &source, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(*namep, &source, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		error("invalid owner name: %s", isc_result_totext(result));
 		isc_buffer_invalidate(&source);
@@ -1731,7 +1730,7 @@ evaluate_key(char *cmdline) {
 
 	isc_buffer_init(&b, namestr, strlen(namestr));
 	isc_buffer_add(&b, strlen(namestr));
-	result = dns_name_fromtext(mykeyname, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(mykeyname, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		fprintf(stderr, "could not parse key name\n");
 		return STATUS_SYNTAX;
@@ -1785,7 +1784,7 @@ evaluate_zone(char *cmdline) {
 	userzone = dns_fixedname_initname(&fuserzone);
 	isc_buffer_init(&b, word, strlen(word));
 	isc_buffer_add(&b, strlen(word));
-	result = dns_name_fromtext(userzone, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(userzone, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		userzone = NULL; /* Lest it point to an invalid name */
 		fprintf(stderr, "could not parse zone name\n");
@@ -3119,7 +3118,7 @@ start_gssrequest(dns_name_t *primary) {
 	RUNTIME_CHECK(result < sizeof(servicename));
 	isc_buffer_init(&buf, servicename, strlen(servicename));
 	isc_buffer_add(&buf, strlen(servicename));
-	result = dns_name_fromtext(servname, &buf, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(servname, &buf, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		fatal("dns_name_fromtext(servname) failed: %s",
 		      isc_result_totext(result));
@@ -3136,7 +3135,7 @@ start_gssrequest(dns_name_t *primary) {
 	isc_buffer_init(&buf, mykeystr, strlen(mykeystr));
 	isc_buffer_add(&buf, strlen(mykeystr));
 
-	result = dns_name_fromtext(keyname, &buf, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(keyname, &buf, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		fatal("dns_name_fromtext(keyname) failed: %s",
 		      isc_result_totext(result));
@@ -3295,7 +3294,7 @@ recvgss(void *arg) {
 	servname = dns_fixedname_initname(&fname);
 	isc_buffer_init(&buf, servicename, strlen(servicename));
 	isc_buffer_add(&buf, strlen(servicename));
-	result = dns_name_fromtext(servname, &buf, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(servname, &buf, dns_rootname, 0);
 	check_result(result, "dns_name_fromtext");
 
 	result = dns_tkey_gssnegotiate(tsigquery, rcvmsg, servname, &context,
diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index fcfb50ccd0..fd1f03a31d 100644
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -141,7 +141,7 @@ sendquery(void) {
 	isc_buffer_init(&buf, host, strlen(host));
 	isc_buffer_add(&buf, strlen(host));
 	result = dns_name_fromtext(dns_fixedname_name(&queryname), &buf,
-				   dns_rootname, 0, NULL);
+				   dns_rootname, 0);
 	CHECK("dns_name_fromtext", result);
 
 	dns_message_create(mctx, NULL, NULL, DNS_MESSAGE_INTENTRENDER,
diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 3ae513b668..cafaf482c9 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -592,7 +592,7 @@ sendquery(struct query *query) {
 	isc_buffer_init(&buf, query->textname, strlen(query->textname));
 	isc_buffer_add(&buf, strlen(query->textname));
 	result = dns_name_fromtext(dns_fixedname_name(&queryname), &buf,
-				   dns_rootname, 0, NULL);
+				   dns_rootname, 0);
 	CHECK("dns_name_fromtext", result);
 
 	dns_message_create(mctx, NULL, NULL, DNS_MESSAGE_INTENTRENDER,
diff --git a/bin/tools/nsec3hash.c b/bin/tools/nsec3hash.c
index c0f62375d8..e55800821e 100644
--- a/bin/tools/nsec3hash.c
+++ b/bin/tools/nsec3hash.c
@@ -122,7 +122,7 @@ nsec3hash(nsec3printer *nsec3print, const char *algostr, const char *flagstr,
 	name = dns_fixedname_initname(&fixed);
 	isc_buffer_constinit(&buffer, domain, strlen(domain));
 	isc_buffer_add(&buffer, strlen(domain));
-	result = dns_name_fromtext(name, &buffer, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &buffer, dns_rootname, 0);
 	check_result(result, "dns_name_fromtext() failed");
 
 	dns_name_downcase(name, name);
diff --git a/fuzz/dns_name_fromtext_target.c b/fuzz/dns_name_fromtext_target.c
index 7886b04371..cdf6e47993 100644
--- a/fuzz/dns_name_fromtext_target.c
+++ b/fuzz/dns_name_fromtext_target.c
@@ -42,7 +42,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 	isc_buffer_setactive(&buf, size);
 
 	result = dns_name_fromtext(dns_fixedname_name(&origin), &buf,
-				   dns_rootname, 0, NULL);
+				   dns_rootname, 0);
 	if (debug) {
 		fprintf(stderr, "dns_name_fromtext: %s\n",
 			isc_result_totext(result));
diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index a0a83c9ec4..fff186746e 100644
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -80,5 +80,5 @@ dns_byaddr_createptrname(const isc_netaddr_t *address, dns_name_t *name) {
 	len = (unsigned int)strlen(textname);
 	isc_buffer_init(&buffer, textname, len);
 	isc_buffer_add(&buffer, len);
-	return dns_name_fromtext(name, &buffer, dns_rootname, 0, NULL);
+	return dns_name_fromtext(name, &buffer, dns_rootname, 0);
 }
diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c
index b6d41678ed..599520092e 100644
--- a/lib/dns/dlz.c
+++ b/lib/dns/dlz.c
@@ -410,7 +410,7 @@ dns_dlz_writeablezone(dns_view_t *view, dns_dlzdb_t *dlzdb,
 	isc_buffer_add(&buffer, strlen(zone_name));
 	dns_fixedname_init(&fixorigin);
 	result = dns_name_fromtext(dns_fixedname_name(&fixorigin), &buffer,
-				   dns_rootname, 0, NULL);
+				   dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		goto cleanup;
 	}
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 7e8f4d2cb9..444eb8fbfd 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1618,8 +1618,7 @@ dst_key_read_public(const char *filename, int type, isc_mem_t *mctx,
 	dns_fixedname_init(&name);
 	isc_buffer_init(&b, DST_AS_STR(token), strlen(DST_AS_STR(token)));
 	isc_buffer_add(&b, strlen(DST_AS_STR(token)));
-	ret = dns_name_fromtext(dns_fixedname_name(&name), &b, dns_rootname, 0,
-				NULL);
+	ret = dns_name_fromtext(dns_fixedname_name(&name), &b, dns_rootname, 0);
 	if (ret != ISC_R_SUCCESS) {
 		goto cleanup;
 	}
diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c
index 273d94a2cd..8e9025d357 100644
--- a/lib/dns/gssapictx.c
+++ b/lib/dns/gssapictx.c
@@ -783,8 +783,7 @@ dst_gssapi_acceptctx(dns_gss_cred_id_t cred, const char *gssapi_keytab,
 		isc_buffer_init(&namebuf, r.base, r.length);
 		isc_buffer_add(&namebuf, r.length);
 
-		RETERR(dns_name_fromtext(principal, &namebuf, dns_rootname, 0,
-					 NULL));
+		RETERR(dns_name_fromtext(principal, &namebuf, dns_rootname, 0));
 
 		if (gnamebuf.length != 0U) {
 			gret = gss_release_buffer(&minor, &gnamebuf);
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 320e36b2ea..cf452104e0 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -799,10 +799,48 @@ dns_name_towire(const dns_name_t *name, dns_compress_t *cctx,
 
 isc_result_t
 dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
-		  const dns_name_t *origin, unsigned int options,
-		  isc_buffer_t *target);
+		  const dns_name_t *origin, unsigned int options);
 /*%<
- * Convert the textual representation of a DNS name at source
+ * Convert the textual representation of a DNS name in 'source'
+ * and store it in 'name'.
+ *
+ * Notes:
+ * \li	Relative domain names will have 'origin' appended to them
+ *	unless 'origin' is NULL, in which case relative domain names
+ *	will remain relative.
+ *
+ * \li	If DNS_NAME_DOWNCASE is set in 'options', any uppercase letters
+ *	in 'source' will be downcased when they are copied into 'target'.
+ *
+ * Requires:
+ *
+ * \li	'name' is a valid name with a dedicated buffer.
+ *
+ * \li	'source' is a valid buffer.
+ *
+ * Ensures:
+ *
+ *	If result is success:
+ * \li		Uppercase letters are downcased in the copy iff
+ *		DNS_NAME_DOWNCASE is set in 'options'.
+ *
+ * \li		The current location in source is advanced.
+ *
+ * Result:
+ *\li	#ISC_R_SUCCESS
+ *\li	#DNS_R_EMPTYLABEL
+ *\li	#DNS_R_LABELTOOLONG
+ *\li	#DNS_R_BADESCAPE
+ *\li	#DNS_R_BADDOTTEDQUAD
+ *\li	#ISC_R_NOSPACE
+ *\li	#ISC_R_UNEXPECTEDEND
+ */
+
+isc_result_t
+dns_name_wirefromtext(isc_buffer_t *source, const dns_name_t *origin,
+		      unsigned int options, isc_buffer_t *target);
+/*%<
+ * Convert the textual representation of a DNS name in 'source'
  * into uncompressed wire form stored in target.
  *
  * Notes:
@@ -815,18 +853,13 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
  *
  * Requires:
  *
- * \li	'name' is a valid name.
- *
  * \li	'source' is a valid buffer.
  *
- * \li	'target' is a valid buffer or 'target' is NULL and 'name' has
- *	a dedicated buffer.
+ * \li	'target' is a valid buffer.
  *
  * Ensures:
  *
  *	If result is success:
- * \li	 	If 'target' is not NULL, 'name' is attached to it.
- *
  * \li		Uppercase letters are downcased in the copy iff
  *		DNS_NAME_DOWNCASE is set in 'options'.
  *
diff --git a/lib/dns/master.c b/lib/dns/master.c
index 08b3a49046..071c1c3475 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -835,8 +835,7 @@ generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs,
 		isc_buffer_init(&buffer, lhsbuf, strlen(lhsbuf));
 		isc_buffer_add(&buffer, strlen(lhsbuf));
 		isc_buffer_setactive(&buffer, strlen(lhsbuf));
-		result = dns_name_fromtext(owner, &buffer, ictx->origin, 0,
-					   NULL);
+		result = dns_name_fromtext(owner, &buffer, ictx->origin, 0);
 		if (result != ISC_R_SUCCESS) {
 			goto error_cleanup;
 		}
@@ -1388,7 +1387,7 @@ load_text(dns_loadctx_t *lctx) {
 			isc_buffer_setactive(&buffer,
 					     token.value.as_region.length);
 			result = dns_name_fromtext(new_name, &buffer,
-						   ictx->origin, 0, NULL);
+						   ictx->origin, 0);
 			if (MANYERRS(lctx, result)) {
 				SETRESULT(lctx, result);
 				LOGIT(result);
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 193c25e310..2641b536ac 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -706,12 +706,11 @@ dns_name_fromregion(dns_name_t *name, const isc_region_t *r) {
 	}
 }
 
-isc_result_t
-dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
-		  const dns_name_t *origin, unsigned int options,
-		  isc_buffer_t *target) {
-	unsigned char *ndata, *label = NULL;
-	char *tdata;
+static isc_result_t
+convert_text(isc_buffer_t *source, const dns_name_t *origin,
+	     unsigned int options, dns_name_t *name, isc_buffer_t *target) {
+	unsigned char *ndata = NULL, *label = NULL;
+	char *tdata = NULL;
 	char c;
 	ft_state state;
 	unsigned int value = 0, count = 0;
@@ -720,20 +719,9 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
 	bool done;
 	bool downcase;
 
-	/*
-	 * Convert the textual representation of a DNS name at source
-	 * into uncompressed wire form stored in target.
-	 *
-	 * Notes:
-	 *	Relative domain names will have 'origin' appended to them
-	 *	unless 'origin' is NULL, in which case relative domain names
-	 *	will remain relative.
-	 */
-
 	REQUIRE(DNS_NAME_VALID(name));
 	REQUIRE(ISC_BUFFER_VALID(source));
-	REQUIRE((target != NULL && ISC_BUFFER_VALID(target)) ||
-		(target == NULL && ISC_BUFFER_VALID(name->buffer)));
+	REQUIRE(ISC_BUFFER_VALID(target));
 
 	downcase = ((options & DNS_NAME_DOWNCASE) != 0);
 
@@ -951,6 +939,27 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
 	return ISC_R_SUCCESS;
 }
 
+isc_result_t
+dns_name_wirefromtext(isc_buffer_t *source, const dns_name_t *origin,
+		      unsigned int options, isc_buffer_t *target) {
+	dns_name_t name;
+
+	REQUIRE(ISC_BUFFER_VALID(target));
+
+	dns_name_init(&name);
+	return convert_text(source, origin, options, &name, target);
+}
+
+isc_result_t
+dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
+		  const dns_name_t *origin, unsigned int options) {
+	REQUIRE(DNS_NAME_VALID(name));
+	REQUIRE(ISC_BUFFER_VALID(name->buffer));
+
+	isc_buffer_clear(name->buffer);
+	return convert_text(source, origin, options, name, name->buffer);
+}
+
 isc_result_t
 dns_name_totext(const dns_name_t *name, unsigned int options,
 		isc_buffer_t *target) {
@@ -1787,7 +1796,7 @@ dns_name_fromstring(dns_name_t *target, const char *src,
 		name = dns_fixedname_initname(&fn);
 	}
 
-	result = dns_name_fromtext(name, &buf, origin, options, NULL);
+	result = dns_name_fromtext(name, &buf, origin, options);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index d0d3eadda7..8791c41605 100644
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -282,7 +282,7 @@ dns_nsec3_hashname(dns_fixedname_t *result,
 	/* convert the hex to a domain name */
 	dns_fixedname_init(result);
 	return dns_name_fromtext(dns_fixedname_name(result), &namebuffer,
-				 origin, 0, NULL);
+				 origin, 0);
 }
 
 unsigned int
diff --git a/lib/dns/peer.c b/lib/dns/peer.c
index 6d733d9636..f633ab285f 100644
--- a/lib/dns/peer.c
+++ b/lib/dns/peer.c
@@ -506,7 +506,7 @@ dns_peer_setkeybycharp(dns_peer_t *peer, const char *keyval) {
 	isc_buffer_constinit(&b, keyval, strlen(keyval));
 	isc_buffer_add(&b, strlen(keyval));
 	result = dns_name_fromtext(dns_fixedname_name(&fname), &b, dns_rootname,
-				   0, NULL);
+				   0);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index e356840d93..ef776e5562 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -20,7 +20,6 @@
 static isc_result_t
 fromtext_any_tsig(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	uint64_t sigtime;
 	isc_buffer_t buffer;
 	dns_rcode_t rcode;
@@ -39,12 +38,11 @@ fromtext_any_tsig(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 
 	/*
 	 * Time Signed: 48 bits.
diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c
index 99c9334c40..95a02fe957 100644
--- a/lib/dns/rdata/ch_3/a_1.c
+++ b/lib/dns/rdata/ch_3/a_1.c
@@ -24,7 +24,8 @@
 static isc_result_t
 fromtext_ch_a(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_a);
@@ -37,22 +38,22 @@ fromtext_ch_a(ARGS_FROMTEXT) {
 				      false));
 
 	/* get domain name */
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+	RETTOK(dns_name_towire(name, NULL, target));
 	if ((options & DNS_RDATA_CHECKNAMES) != 0 &&
 	    (options & DNS_RDATA_CHECKREVERSE) != 0)
 	{
 		bool ok;
-		ok = dns_name_ishostname(&name, false);
+		ok = dns_name_ishostname(name, false);
 		if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 			RETTOK(DNS_R_BADNAME);
 		}
 		if (!ok && callbacks != NULL) {
-			warn_badname(&name, lexer, callbacks);
+			warn_badname(name, lexer, callbacks);
 		}
 	}
 
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index 25bd2e0b69..0721610807 100644
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -22,7 +22,8 @@ static isc_result_t
 fromtext_afsdb(ARGS_FROMTEXT) {
 	isc_token_t token;
 	isc_buffer_t buffer;
-	dns_name_t name;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 	bool ok;
 
 	REQUIRE(type == dns_rdatatype_afsdb);
@@ -46,21 +47,21 @@ fromtext_afsdb(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+	RETTOK(dns_name_towire(name, NULL, target));
 	ok = true;
 	if ((options & DNS_RDATA_CHECKNAMES) != 0) {
-		ok = dns_name_ishostname(&name, false);
+		ok = dns_name_ishostname(name, false);
 	}
 	if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 		RETTOK(DNS_R_BADNAME);
 	}
 	if (!ok && callbacks != NULL) {
-		warn_badname(&name, lexer, callbacks);
+		warn_badname(name, lexer, callbacks);
 	}
 	return ISC_R_SUCCESS;
 }
diff --git a/lib/dns/rdata/generic/amtrelay_260.c b/lib/dns/rdata/generic/amtrelay_260.c
index 1bd7378745..00c66c7bf6 100644
--- a/lib/dns/rdata/generic/amtrelay_260.c
+++ b/lib/dns/rdata/generic/amtrelay_260.c
@@ -23,7 +23,6 @@
 static isc_result_t
 fromtext_amtrelay(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	unsigned int discovery;
 	unsigned int gateway;
@@ -108,13 +107,11 @@ fromtext_amtrelay(ARGS_FROMTEXT) {
 		return ISC_R_SUCCESS;
 
 	case 3:
-		dns_name_init(&name);
 		buffer_fromregion(&buffer, &token.value.as_region);
 		if (origin == NULL) {
 			origin = dns_rootname;
 		}
-		return dns_name_fromtext(&name, &buffer, origin, options,
-					 target);
+		return dns_name_wirefromtext(&buffer, origin, options, target);
 	default:
 		UNREACHABLE();
 	}
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index a946097be6..dbf333effb 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -20,7 +20,6 @@
 static isc_result_t
 fromtext_cname(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_cname);
@@ -32,12 +31,11 @@ fromtext_cname(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index ce87676a1e..6e1d6e14d2 100644
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -21,7 +21,6 @@
 static isc_result_t
 fromtext_dname(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_dname);
@@ -33,12 +32,11 @@ fromtext_dname(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c
index 228922ba92..b084a899eb 100644
--- a/lib/dns/rdata/generic/hip_55.c
+++ b/lib/dns/rdata/generic/hip_55.c
@@ -20,7 +20,6 @@
 static isc_result_t
 fromtext_hip(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	isc_buffer_t hit_len;
 	isc_buffer_t key_len;
@@ -96,7 +95,6 @@ fromtext_hip(ARGS_FROMTEXT) {
 	/*
 	 * Rendezvous Servers.
 	 */
-	dns_name_init(&name);
 	do {
 		RETERR(isc_lex_getmastertoken(lexer, &token,
 					      isc_tokentype_string, true));
@@ -104,8 +102,7 @@ fromtext_hip(ARGS_FROMTEXT) {
 			break;
 		}
 		buffer_fromregion(&buffer, &token.value.as_region);
-		RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
-					 target));
+		RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	} while (1);
 
 	/*
diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index d479e7d2d9..4c4996c4bb 100644
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -23,7 +23,6 @@
 static isc_result_t
 fromtext_ipseckey(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	unsigned int gateway;
 	struct in_addr addr;
@@ -105,13 +104,11 @@ fromtext_ipseckey(ARGS_FROMTEXT) {
 		break;
 
 	case 3:
-		dns_name_init(&name);
 		buffer_fromregion(&buffer, &token.value.as_region);
 		if (origin == NULL) {
 			origin = dns_rootname;
 		}
-		RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
-					 target));
+		RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 		break;
 	}
 
diff --git a/lib/dns/rdata/generic/lp_107.c b/lib/dns/rdata/generic/lp_107.c
index 6bc41e298d..00aa6abc90 100644
--- a/lib/dns/rdata/generic/lp_107.c
+++ b/lib/dns/rdata/generic/lp_107.c
@@ -23,7 +23,6 @@
 static isc_result_t
 fromtext_lp(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_lp);
@@ -42,12 +41,11 @@ fromtext_lp(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	return dns_name_fromtext(&name, &buffer, origin, options, target);
+	return dns_name_wirefromtext(&buffer, origin, options, target);
 }
 
 static isc_result_t
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index ab6ab42b0c..555d92a514 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -19,7 +19,6 @@
 static isc_result_t
 fromtext_mb(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_mb);
@@ -31,12 +30,11 @@ fromtext_mb(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index 702b60c185..217fd3b0bf 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -19,7 +19,6 @@
 static isc_result_t
 fromtext_md(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_md);
@@ -31,12 +30,11 @@ fromtext_md(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index 0142c12478..8f353bf717 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -19,7 +19,6 @@
 static isc_result_t
 fromtext_mf(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_mf);
@@ -31,12 +30,11 @@ fromtext_mf(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 0c8fae21c9..15dba05c01 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -19,7 +19,6 @@
 static isc_result_t
 fromtext_mg(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_mg);
@@ -31,12 +30,11 @@ fromtext_mg(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index 7ea92d7c99..460d37c573 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -19,7 +19,8 @@
 static isc_result_t
 fromtext_minfo(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 	isc_buffer_t buffer;
 	int i;
 	bool ok;
@@ -37,19 +38,18 @@ fromtext_minfo(ARGS_FROMTEXT) {
 	for (i = 0; i < 2; i++) {
 		RETERR(isc_lex_getmastertoken(lexer, &token,
 					      isc_tokentype_string, false));
-		dns_name_init(&name);
 		buffer_fromregion(&buffer, &token.value.as_region);
-		RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
-					 target));
+		RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+		RETTOK(dns_name_towire(name, NULL, target));
 		ok = true;
 		if ((options & DNS_RDATA_CHECKNAMES) != 0) {
-			ok = dns_name_ismailbox(&name);
+			ok = dns_name_ismailbox(name);
 		}
 		if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 			RETTOK(DNS_R_BADNAME);
 		}
 		if (!ok && callbacks != NULL) {
-			warn_badname(&name, lexer, callbacks);
+			warn_badname(name, lexer, callbacks);
 		}
 	}
 	return ISC_R_SUCCESS;
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index 4e62678852..df023d731a 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -19,7 +19,6 @@
 static isc_result_t
 fromtext_mr(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_mr);
@@ -31,12 +30,11 @@ fromtext_mr(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index afa40e6309..84ffd0e4a5 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -47,7 +47,8 @@ check_mx(isc_token_t *token) {
 static isc_result_t
 fromtext_mx(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 	isc_buffer_t buffer;
 	bool ok;
 
@@ -77,21 +78,21 @@ fromtext_mx(ARGS_FROMTEXT) {
 		warn_badmx(&token, lexer, callbacks);
 	}
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+	RETTOK(dns_name_towire(name, NULL, target));
 	ok = true;
 	if ((options & DNS_RDATA_CHECKNAMES) != 0) {
-		ok = dns_name_ishostname(&name, false);
+		ok = dns_name_ishostname(name, false);
 	}
 	if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 		RETTOK(DNS_R_BADNAME);
 	}
 	if (!ok && callbacks != NULL) {
-		warn_badname(&name, lexer, callbacks);
+		warn_badname(name, lexer, callbacks);
 	}
 	return ISC_R_SUCCESS;
 }
diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index 3715bbcbe3..7589106c6a 100644
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -172,7 +172,6 @@ txt_valid_regex(const unsigned char *txt) {
 static isc_result_t
 fromtext_naptr(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	unsigned char *regex;
 
@@ -230,12 +229,11 @@ fromtext_naptr(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index b6b38f4388..89362b6c83 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -19,7 +19,8 @@
 static isc_result_t
 fromtext_ns(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 	isc_buffer_t buffer;
 	bool ok;
 
@@ -32,21 +33,21 @@ fromtext_ns(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+	RETTOK(dns_name_towire(name, NULL, target));
 	ok = true;
 	if ((options & DNS_RDATA_CHECKNAMES) != 0) {
-		ok = dns_name_ishostname(&name, false);
+		ok = dns_name_ishostname(name, false);
 	}
 	if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 		RETTOK(DNS_R_BADNAME);
 	}
 	if (!ok && callbacks != NULL) {
-		warn_badname(&name, lexer, callbacks);
+		warn_badname(name, lexer, callbacks);
 	}
 	return ISC_R_SUCCESS;
 }
diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c
index 28fea07c82..e8858bb6d8 100644
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -27,7 +27,6 @@
 static isc_result_t
 fromtext_nsec(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_nsec);
@@ -41,12 +40,11 @@ fromtext_nsec(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 
 	return typemap_fromtext(lexer, target, false);
 }
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index a552276292..077bd73f5a 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -25,7 +25,6 @@
 static isc_result_t
 fromtext_nxt(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	char *e;
 	unsigned char bm[8 * 1024]; /* 64k bits */
@@ -45,12 +44,11 @@ fromtext_nxt(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 
 	memset(bm, 0, sizeof(bm));
 	do {
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 24d975a0b9..e0b5ea6309 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -19,8 +19,9 @@
 static isc_result_t
 fromtext_ptr(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 
 	REQUIRE(type == dns_rdatatype_ptr);
 
@@ -31,23 +32,25 @@ fromtext_ptr(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+
+	RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+	RETTOK(dns_name_towire(name, NULL, target));
+
 	if (rdclass == dns_rdataclass_in &&
 	    (options & DNS_RDATA_CHECKNAMES) != 0 &&
 	    (options & DNS_RDATA_CHECKREVERSE) != 0)
 	{
 		bool ok;
-		ok = dns_name_ishostname(&name, false);
+		ok = dns_name_ishostname(name, false);
 		if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 			RETTOK(DNS_R_BADNAME);
 		}
 		if (!ok && callbacks != NULL) {
-			warn_badname(&name, lexer, callbacks);
+			warn_badname(name, lexer, callbacks);
 		}
 	}
 	return ISC_R_SUCCESS;
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index 33c8192fac..bc1861e988 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -21,7 +21,6 @@
 static isc_result_t
 fromtext_rp(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	int i;
 	bool ok;
@@ -37,21 +36,25 @@ fromtext_rp(ARGS_FROMTEXT) {
 	}
 
 	for (i = 0; i < 2; i++) {
+		dns_fixedname_t fn;
+		dns_name_t *name = dns_fixedname_initname(&fn);
+
 		RETERR(isc_lex_getmastertoken(lexer, &token,
 					      isc_tokentype_string, false));
-		dns_name_init(&name);
 		buffer_fromregion(&buffer, &token.value.as_region);
-		RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
-					 target));
+
+		RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+		RETTOK(dns_name_towire(name, NULL, target));
+
 		ok = true;
 		if ((options & DNS_RDATA_CHECKNAMES) != 0 && i == 0) {
-			ok = dns_name_ismailbox(&name);
+			ok = dns_name_ismailbox(name);
 		}
 		if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 			RETTOK(DNS_R_BADNAME);
 		}
 		if (!ok && callbacks != NULL) {
-			warn_badname(&name, lexer, callbacks);
+			warn_badname(name, lexer, callbacks);
 		}
 	}
 	return ISC_R_SUCCESS;
diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index bcfac4a666..91202513af 100644
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -28,7 +28,6 @@ fromtext_rrsig(ARGS_FROMTEXT) {
 	dns_rdatatype_t covered;
 	char *e;
 	isc_result_t result;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	uint32_t time_signed, time_expire;
 	unsigned int used;
@@ -145,12 +144,11 @@ fromtext_rrsig(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 
 	/*
 	 * Sig.
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 41c0df41f3..798693f92b 100644
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -21,8 +21,9 @@
 static isc_result_t
 fromtext_rt(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 	bool ok;
 
 	REQUIRE(type == dns_rdatatype_rt);
@@ -41,21 +42,23 @@ fromtext_rt(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+
+	RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+	RETTOK(dns_name_towire(name, NULL, target));
+
 	ok = true;
 	if ((options & DNS_RDATA_CHECKNAMES) != 0) {
-		ok = dns_name_ishostname(&name, false);
+		ok = dns_name_ishostname(name, false);
 	}
 	if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 		RETTOK(DNS_R_BADNAME);
 	}
 	if (!ok && callbacks != NULL) {
-		warn_badname(&name, lexer, callbacks);
+		warn_badname(name, lexer, callbacks);
 	}
 	return ISC_R_SUCCESS;
 }
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index c5d3ed3ef7..04b37fcd39 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -26,7 +26,6 @@ fromtext_sig(ARGS_FROMTEXT) {
 	dns_rdatatype_t covered;
 	char *e;
 	isc_result_t result;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	uint32_t time_signed, time_expire;
 	unsigned int used;
@@ -109,12 +108,11 @@ fromtext_sig(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 
 	/*
 	 * Sig.
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 782da3c1a8..427433ee28 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -19,7 +19,6 @@
 static isc_result_t
 fromtext_soa(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	int i;
 	uint32_t n;
@@ -36,21 +35,23 @@ fromtext_soa(ARGS_FROMTEXT) {
 	}
 
 	for (i = 0; i < 2; i++) {
+		dns_fixedname_t fn;
+		dns_name_t *name = dns_fixedname_initname(&fn);
+
 		RETERR(isc_lex_getmastertoken(lexer, &token,
 					      isc_tokentype_string, false));
 
-		dns_name_init(&name);
 		buffer_fromregion(&buffer, &token.value.as_region);
-		RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
-					 target));
+		RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+		RETTOK(dns_name_towire(name, NULL, target));
 		ok = true;
 		if ((options & DNS_RDATA_CHECKNAMES) != 0) {
 			switch (i) {
 			case 0:
-				ok = dns_name_ishostname(&name, false);
+				ok = dns_name_ishostname(name, false);
 				break;
 			case 1:
-				ok = dns_name_ismailbox(&name);
+				ok = dns_name_ismailbox(name);
 				break;
 			}
 		}
@@ -58,7 +59,7 @@ fromtext_soa(ARGS_FROMTEXT) {
 			RETTOK(DNS_R_BADNAME);
 		}
 		if (!ok && callbacks != NULL) {
-			warn_badname(&name, lexer, callbacks);
+			warn_badname(name, lexer, callbacks);
 		}
 	}
 
diff --git a/lib/dns/rdata/generic/talink_58.c b/lib/dns/rdata/generic/talink_58.c
index 148a11569c..fef1195b32 100644
--- a/lib/dns/rdata/generic/talink_58.c
+++ b/lib/dns/rdata/generic/talink_58.c
@@ -19,7 +19,6 @@
 static isc_result_t
 fromtext_talink(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	int i;
 
@@ -37,10 +36,8 @@ fromtext_talink(ARGS_FROMTEXT) {
 		RETERR(isc_lex_getmastertoken(lexer, &token,
 					      isc_tokentype_string, false));
 
-		dns_name_init(&name);
 		buffer_fromregion(&buffer, &token.value.as_region);
-		RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
-					 target));
+		RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	}
 
 	return ISC_R_SUCCESS;
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index dbea25a1da..b16757b3ad 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -22,7 +22,6 @@ static isc_result_t
 fromtext_tkey(ARGS_FROMTEXT) {
 	isc_token_t token;
 	dns_rcode_t rcode;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	long i;
 	char *e;
@@ -38,12 +37,11 @@ fromtext_tkey(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 
 	/*
 	 * Inception.
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index b70a65343f..822f9b225b 100644
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -27,8 +27,9 @@ fromtext_in_a6(ARGS_FROMTEXT) {
 	unsigned char prefixlen;
 	unsigned char octets;
 	unsigned char mask;
-	dns_name_t name;
 	isc_buffer_t buffer;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 	bool ok;
 
 	REQUIRE(type == dns_rdatatype_a6);
@@ -77,21 +78,23 @@ fromtext_in_a6(ARGS_FROMTEXT) {
 
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+
+	RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+	RETTOK(dns_name_towire(name, NULL, target));
+
 	ok = true;
 	if ((options & DNS_RDATA_CHECKNAMES) != 0) {
-		ok = dns_name_ishostname(&name, false);
+		ok = dns_name_ishostname(name, false);
 	}
 	if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 		RETTOK(DNS_R_BADNAME);
 	}
 	if (!ok && callbacks != NULL) {
-		warn_badname(&name, lexer, callbacks);
+		warn_badname(name, lexer, callbacks);
 	}
 	return ISC_R_SUCCESS;
 }
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index aebc7292a5..3498b72d26 100644
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -21,7 +21,6 @@
 static isc_result_t
 fromtext_in_kx(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_kx);
@@ -40,12 +39,11 @@ fromtext_in_kx(ARGS_FROMTEXT) {
 
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index 55167cebee..929d326422 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -21,7 +21,6 @@
 static isc_result_t
 fromtext_in_nsap_ptr(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_nsap_ptr);
@@ -34,12 +33,11 @@ fromtext_in_nsap_ptr(ARGS_FROMTEXT) {
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
 
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 1301767596..89603478ed 100644
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -21,7 +21,6 @@
 static isc_result_t
 fromtext_in_px(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 
 	REQUIRE(type == dns_rdatatype_px);
@@ -50,18 +49,16 @@ fromtext_in_px(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 
 	/*
 	 * MAPX400.
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_wirefromtext(&buffer, origin, options, target));
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 0b8f34b53b..5c0cb1ed72 100644
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -21,8 +21,9 @@
 static isc_result_t
 fromtext_in_srv(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 	bool ok;
 
 	REQUIRE(type == dns_rdatatype_srv);
@@ -67,22 +68,24 @@ fromtext_in_srv(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+	RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+	RETTOK(dns_name_towire(name, NULL, target));
 	ok = true;
+
 	if ((options & DNS_RDATA_CHECKNAMES) != 0) {
-		ok = dns_name_ishostname(&name, false);
+		ok = dns_name_ishostname(name, false);
 	}
 	if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 		RETTOK(DNS_R_BADNAME);
 	}
 	if (!ok && callbacks != NULL) {
-		warn_badname(&name, lexer, callbacks);
+		warn_badname(name, lexer, callbacks);
 	}
+
 	return ISC_R_SUCCESS;
 }
 
diff --git a/lib/dns/rdata/in_1/svcb_64.c b/lib/dns/rdata/in_1/svcb_64.c
index b2f239ef99..0f458c9c04 100644
--- a/lib/dns/rdata/in_1/svcb_64.c
+++ b/lib/dns/rdata/in_1/svcb_64.c
@@ -552,11 +552,12 @@ svcsortkeys(isc_buffer_t *target, unsigned int used) {
 static isc_result_t
 generic_fromtext_in_svcb(ARGS_FROMTEXT) {
 	isc_token_t token;
-	dns_name_t name;
 	isc_buffer_t buffer;
 	bool alias;
 	bool ok = true;
 	unsigned int used;
+	dns_fixedname_t fn;
+	dns_name_t *name = dns_fixedname_initname(&fn);
 
 	UNUSED(type);
 	UNUSED(rdclass);
@@ -579,20 +580,22 @@ generic_fromtext_in_svcb(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring,
 				      false));
-	dns_name_init(&name);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	if (origin == NULL) {
 		origin = dns_rootname;
 	}
-	RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
+
+	RETTOK(dns_name_fromtext(name, &buffer, origin, options));
+	RETTOK(dns_name_towire(name, NULL, target));
+
 	if (!alias && (options & DNS_RDATA_CHECKNAMES) != 0) {
-		ok = dns_name_ishostname(&name, false);
+		ok = dns_name_ishostname(name, false);
 	}
 	if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) {
 		RETTOK(DNS_R_BADNAME);
 	}
 	if (!ok && callbacks != NULL) {
-		warn_badname(&name, lexer, callbacks);
+		warn_badname(name, lexer, callbacks);
 	}
 
 	/*
diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index 24a95af3d5..42c7b286ba 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -818,7 +818,7 @@ ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix,
 
 	isc_buffer_init(&buffer, str, sizeof(str));
 	isc_buffer_add(&buffer, len);
-	result = dns_name_fromtext(ip_name, &buffer, base_name, 0, NULL);
+	result = dns_name_fromtext(ip_name, &buffer, base_name, 0);
 	return result;
 }
 
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index c65da7cd5e..e99f34da13 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1798,7 +1798,7 @@ dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name,
 	isc_buffer_constinit(&b, name, strlen(name));
 	isc_buffer_add(&b, strlen(name));
 
-	result = dns_name_fromtext(newname, &b, origin, 0, NULL);
+	result = dns_name_fromtext(newname, &b, origin, 0);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
diff --git a/lib/dns/skr.c b/lib/dns/skr.c
index e2dada1f79..ee64025b34 100644
--- a/lib/dns/skr.c
+++ b/lib/dns/skr.c
@@ -72,7 +72,7 @@ parse_rr(isc_lex_t *lex, isc_mem_t *mctx, char *owner, dns_name_t *origin,
 	dname = dns_fixedname_initname(&dfname);
 	isc_buffer_init(&b, owner, strlen(owner));
 	isc_buffer_add(&b, strlen(owner));
-	ret = dns_name_fromtext(dname, &b, dns_rootname, 0, NULL);
+	ret = dns_name_fromtext(dname, &b, dns_rootname, 0);
 	if (ret != ISC_R_SUCCESS) {
 		return ret;
 	}
diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c
index 0649307400..29ca14ee68 100644
--- a/lib/dns/ssu.c
+++ b/lib/dns/ssu.c
@@ -278,7 +278,7 @@ reverse_from_address(dns_name_t *tcpself, const isc_netaddr_t *tcpaddr) {
 	}
 	isc_buffer_init(&b, buf, strlen(buf));
 	isc_buffer_add(&b, strlen(buf));
-	result = dns_name_fromtext(tcpself, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(tcpself, &b, dns_rootname, 0);
 	RUNTIME_CHECK(result == ISC_R_SUCCESS);
 }
 
@@ -318,7 +318,7 @@ stf_from_address(dns_name_t *stfself, const isc_netaddr_t *tcpaddr) {
 	}
 	isc_buffer_init(&b, buf, strlen(buf));
 	isc_buffer_add(&b, strlen(buf));
-	result = dns_name_fromtext(stfself, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(stfself, &b, dns_rootname, 0);
 	RUNTIME_CHECK(result == ISC_R_SUCCESS);
 }
 
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 377cdb9047..ecfb21731d 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -473,7 +473,7 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx,
 			isc_nonce_buf(randomdata, sizeof(randomdata));
 			isc_buffer_init(&b, randomtext, sizeof(randomtext));
 			RETERR(isc_hex_totext(&r, 2, "", &b));
-			RETERR(dns_name_fromtext(keyname, &b, NULL, 0, NULL));
+			RETERR(dns_name_fromtext(keyname, &b, NULL, 0));
 		}
 		RETERR(dns_name_concatenate(keyname, dns_rootname, keyname));
 
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 828a4addf1..57da184658 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -372,7 +372,7 @@ restore_key(dns_tsigkeyring_t *ring, isc_stdtime_t now, FILE *fp) {
 	name = dns_fixedname_initname(&fname);
 	isc_buffer_init(&b, namestr, strlen(namestr));
 	isc_buffer_add(&b, strlen(namestr));
-	result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
@@ -380,7 +380,7 @@ restore_key(dns_tsigkeyring_t *ring, isc_stdtime_t now, FILE *fp) {
 	creator = dns_fixedname_initname(&fcreator);
 	isc_buffer_init(&b, creatorstr, strlen(creatorstr));
 	isc_buffer_add(&b, strlen(creatorstr));
-	result = dns_name_fromtext(creator, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(creator, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
@@ -388,7 +388,7 @@ restore_key(dns_tsigkeyring_t *ring, isc_stdtime_t now, FILE *fp) {
 	algorithm = dns_fixedname_initname(&falgorithm);
 	isc_buffer_init(&b, algorithmstr, strlen(algorithmstr));
 	isc_buffer_add(&b, strlen(algorithmstr));
-	result = dns_name_fromtext(algorithm, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(algorithm, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
diff --git a/lib/dns/view.c b/lib/dns/view.c
index be7db571c8..963d862723 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -2071,8 +2071,7 @@ dns_view_loadnta(dns_view_t *view) {
 
 			isc_buffer_init(&b, name, (unsigned int)len);
 			isc_buffer_add(&b, (unsigned int)len);
-			CHECK(dns_name_fromtext(fname, &b, dns_rootname, 0,
-						NULL));
+			CHECK(dns_name_fromtext(fname, &b, dns_rootname, 0));
 			ntaname = fname;
 		}
 
diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index 10973151cc..133322a0df 100644
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -181,7 +181,7 @@ convert_keyname(const cfg_obj_t *keyobj, isc_mem_t *mctx, dns_name_t *dnsname) {
 	isc_buffer_add(&buf, keylen);
 	dns_fixedname_init(&fixname);
 	result = dns_name_fromtext(dns_fixedname_name(&fixname), &buf,
-				   dns_rootname, 0, NULL);
+				   dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		cfg_obj_log(keyobj, ISC_LOG_WARNING,
 			    "key name '%s' is not a valid domain name",
diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c
index c60eec4b67..2e8a4b2297 100644
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -136,7 +136,7 @@ check_orderent(const cfg_obj_t *ent) {
 		isc_buffer_constinit(&b, str, strlen(str));
 		isc_buffer_add(&b, strlen(str));
 		tresult = dns_name_fromtext(dns_fixedname_name(&fixed), &b,
-					    dns_rootname, 0, NULL);
+					    dns_rootname, 0);
 		if (tresult != ISC_R_SUCCESS) {
 			cfg_obj_log(obj, ISC_LOG_ERROR,
 				    "rrset-order: invalid name '%s'", str);
@@ -243,8 +243,7 @@ check_dual_stack(const cfg_obj_t *options) {
 		isc_buffer_constinit(&buffer, str, strlen(str));
 		isc_buffer_add(&buffer, strlen(str));
 		name = dns_fixedname_initname(&fixed);
-		tresult = dns_name_fromtext(name, &buffer, dns_rootname, 0,
-					    NULL);
+		tresult = dns_name_fromtext(name, &buffer, dns_rootname, 0);
 		if (tresult != ISC_R_SUCCESS) {
 			cfg_obj_log(obj, ISC_LOG_ERROR, "bad name '%s'", str);
 			if (result == ISC_R_SUCCESS) {
@@ -365,7 +364,7 @@ disabled_algorithms(const cfg_obj_t *disabled) {
 	str = cfg_obj_asstring(obj);
 	isc_buffer_constinit(&b, str, strlen(str));
 	isc_buffer_add(&b, strlen(str));
-	tresult = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+	tresult = dns_name_fromtext(name, &b, dns_rootname, 0);
 	if (tresult != ISC_R_SUCCESS) {
 		cfg_obj_log(obj, ISC_LOG_ERROR, "bad domain name '%s'", str);
 		result = tresult;
@@ -408,7 +407,7 @@ disabled_ds_digests(const cfg_obj_t *disabled) {
 	str = cfg_obj_asstring(obj);
 	isc_buffer_constinit(&b, str, strlen(str));
 	isc_buffer_add(&b, strlen(str));
-	tresult = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+	tresult = dns_name_fromtext(name, &b, dns_rootname, 0);
 	if (tresult != ISC_R_SUCCESS) {
 		cfg_obj_log(obj, ISC_LOG_ERROR, "bad domain name '%s'", str);
 		result = tresult;
@@ -3130,7 +3129,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
 	isc_buffer_constinit(&b, znamestr, strlen(znamestr));
 	isc_buffer_add(&b, strlen(znamestr));
 	tresult = dns_name_fromtext(dns_fixedname_name(&fixedname), &b,
-				    dns_rootname, DNS_NAME_DOWNCASE, NULL);
+				    dns_rootname, DNS_NAME_DOWNCASE);
 	if (tresult != ISC_R_SUCCESS) {
 		cfg_obj_log(zconfig, ISC_LOG_ERROR,
 			    "zone '%s': is not a valid name", znamestr);
@@ -3718,8 +3717,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
 			isc_buffer_constinit(&b2, snamestr, strlen(snamestr));
 			isc_buffer_add(&b2, strlen(snamestr));
 			sname = dns_fixedname_initname(&fixed_sname);
-			tresult = dns_name_fromtext(sname, &b2, dns_rootname, 0,
-						    NULL);
+			tresult = dns_name_fromtext(sname, &b2, dns_rootname,
+						    0);
 			if (tresult != ISC_R_SUCCESS) {
 				cfg_obj_log(zconfig, ISC_LOG_ERROR,
 					    "server-name '%s' is not a valid "
@@ -4153,7 +4152,7 @@ check_keylist(const cfg_obj_t *keys, isc_symtab_t *symtab, isc_mem_t *mctx) {
 
 		isc_buffer_constinit(&b, keyid, strlen(keyid));
 		isc_buffer_add(&b, strlen(keyid));
-		tresult = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+		tresult = dns_name_fromtext(name, &b, dns_rootname, 0);
 		if (tresult != ISC_R_SUCCESS) {
 			cfg_obj_log(key, ISC_LOG_ERROR,
 				    "key '%s': bad key name", keyid);
@@ -4393,7 +4392,7 @@ check_servers(const cfg_obj_t *config, const cfg_obj_t *voptions,
 			isc_buffer_add(&b, strlen(keyval));
 			keyname = dns_fixedname_initname(&fname);
 			tresult = dns_name_fromtext(keyname, &b, dns_rootname,
-						    0, NULL);
+						    0);
 			if (tresult != ISC_R_SUCCESS) {
 				cfg_obj_log(keys, ISC_LOG_ERROR,
 					    "bad key name '%s'", keyval);
@@ -4558,7 +4557,7 @@ check_trust_anchor(const cfg_obj_t *key, unsigned int *flagsp) {
 	keyname = dns_fixedname_initname(&fkeyname);
 	isc_buffer_constinit(&b, namestr, strlen(namestr));
 	isc_buffer_add(&b, strlen(namestr));
-	result = dns_name_fromtext(keyname, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(keyname, &b, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		cfg_obj_log(key, ISC_LOG_WARNING, "bad key name: %s\n",
 			    isc_result_totext(result));
diff --git a/tests/bench/compress.c b/tests/bench/compress.c
index 31e73f5be1..912e8847e2 100644
--- a/tests/bench/compress.c
+++ b/tests/bench/compress.c
@@ -62,7 +62,7 @@ main(void) {
 			errx(1, "too many names");
 		}
 		dns_name_t *name = dns_fixedname_initname(&fixedname[count++]);
-		result = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL);
+		result = dns_name_fromtext(name, &buf, dns_rootname, 0);
 		CHECKRESULT(result, line);
 	}
 
diff --git a/tests/bench/load-names.c b/tests/bench/load-names.c
index ca9aa0ac3a..9957bbc543 100644
--- a/tests/bench/load-names.c
+++ b/tests/bench/load-names.c
@@ -471,8 +471,7 @@ main(int argc, char *argv[]) {
 		isc_buffer_t buffer;
 		isc_buffer_init(&buffer, domain, len);
 		isc_buffer_add(&buffer, len);
-		result = dns_name_fromtext(name, &buffer, dns_rootname, 0,
-					   NULL);
+		result = dns_name_fromtext(name, &buffer, dns_rootname, 0);
 		FILE_CHECK(result == ISC_R_SUCCESS, isc_result_totext(result));
 
 		wirebytes += name->length;
diff --git a/tests/bench/qp-dump.c b/tests/bench/qp-dump.c
index 612a5b0446..476cab2bfc 100644
--- a/tests/bench/qp-dump.c
+++ b/tests/bench/qp-dump.c
@@ -203,8 +203,7 @@ main(int argc, char *argv[]) {
 
 		isc_buffer_init(&buffer, domain, len);
 		isc_buffer_add(&buffer, len);
-		result = dns_name_fromtext(name, &buffer, dns_rootname, 0,
-					   NULL);
+		result = dns_name_fromtext(name, &buffer, dns_rootname, 0);
 		if (result == ISC_R_SUCCESS) {
 			smallname_from_name(name, &pval, &ival);
 			result = dns_qp_insert(qp, pval, ival);
diff --git a/tests/bench/qplookups.c b/tests/bench/qplookups.c
index 23130caedd..ed31ecf318 100644
--- a/tests/bench/qplookups.c
+++ b/tests/bench/qplookups.c
@@ -162,8 +162,7 @@ load_qp(dns_qp_t *qp, const char *filename) {
 
 		isc_buffer_init(&buffer, domain, len);
 		isc_buffer_add(&buffer, len);
-		result = dns_name_fromtext(name, &buffer, dns_rootname, 0,
-					   NULL);
+		result = dns_name_fromtext(name, &buffer, dns_rootname, 0);
 		if (result == ISC_R_SUCCESS) {
 			smallname_from_name(name, &pval, &ival);
 			result = dns_qp_insert(qp, pval, ival);
diff --git a/tests/dns/dbiterator_test.c b/tests/dns/dbiterator_test.c
index 67e19c71e5..a84e4d806c 100644
--- a/tests/dns/dbiterator_test.c
+++ b/tests/dns/dbiterator_test.c
@@ -42,7 +42,7 @@ make_name(const char *src, dns_name_t *name) {
 	isc_buffer_t b;
 	isc_buffer_constinit(&b, src, strlen(src));
 	isc_buffer_add(&b, strlen(src));
-	return dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+	return dns_name_fromtext(name, &b, dns_rootname, 0);
 }
 
 /* create: make sure we can create a dbiterator */
diff --git a/tests/dns/dispatch_test.c b/tests/dns/dispatch_test.c
index c6c743f12f..ae3bed56db 100644
--- a/tests/dns/dispatch_test.c
+++ b/tests/dns/dispatch_test.c
@@ -219,7 +219,7 @@ setup_test(void **state) {
 	isc_buffer_constinit(&namesrc, tls_name_str, strlen(tls_name_str));
 	isc_buffer_add(&namesrc, strlen(tls_name_str));
 	if (dns_name_fromtext(tls_name, &namesrc, dns_rootname,
-			      DNS_NAME_DOWNCASE, NULL) != ISC_R_SUCCESS)
+			      DNS_NAME_DOWNCASE) != ISC_R_SUCCESS)
 	{
 		return -1;
 	}
diff --git a/tests/dns/dnstap_test.c b/tests/dns/dnstap_test.c
index a7b1aaf5b0..de88bd1655 100644
--- a/tests/dns/dnstap_test.c
+++ b/tests/dns/dnstap_test.c
@@ -180,7 +180,7 @@ ISC_LOOP_TEST_IMPL(dns_dt_send) {
 	zname = dns_fixedname_initname(&zfname);
 	isc_buffer_constinit(&zb, "example.com.", 12);
 	isc_buffer_add(&zb, 12);
-	result = dns_name_fromtext(zname, &zb, NULL, 0, NULL);
+	result = dns_name_fromtext(zname, &zb, NULL, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 
 	memset(&zr, 0, sizeof(zr));
diff --git a/tests/dns/dst_test.c b/tests/dns/dst_test.c
index 871a4931ce..10bb24bc9b 100644
--- a/tests/dns/dst_test.c
+++ b/tests/dns/dst_test.c
@@ -163,7 +163,7 @@ check_sig(const char *datapath, const char *sigpath, const char *keyname,
 	name = dns_fixedname_initname(&fname);
 	isc_buffer_constinit(&b, keyname, strlen(keyname));
 	isc_buffer_add(&b, strlen(keyname));
-	result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &b, dns_rootname, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 	result = dst_key_fromfile(name, id, alg, type,
 				  TESTS_DIR "/testdata/dst", mctx, &key);
@@ -298,7 +298,7 @@ check_cmp(const char *key1_name, dns_keytag_t key1_id, const char *key2_name,
 	name1 = dns_fixedname_initname(&fname1);
 	isc_buffer_constinit(&b1, key1_name, strlen(key1_name));
 	isc_buffer_add(&b1, strlen(key1_name));
-	result = dns_name_fromtext(name1, &b1, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name1, &b1, dns_rootname, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 	result = dst_key_fromfile(name1, key1_id, alg, type,
 				  TESTS_DIR "/comparekeys", mctx, &key1);
@@ -310,7 +310,7 @@ check_cmp(const char *key1_name, dns_keytag_t key1_id, const char *key2_name,
 	name2 = dns_fixedname_initname(&fname2);
 	isc_buffer_constinit(&b2, key2_name, strlen(key2_name));
 	isc_buffer_add(&b2, strlen(key2_name));
-	result = dns_name_fromtext(name2, &b2, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name2, &b2, dns_rootname, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 	result = dst_key_fromfile(name2, key2_id, alg, type,
 				  TESTS_DIR "/comparekeys", mctx, &key2);
@@ -445,7 +445,7 @@ ISC_RUN_TEST_IMPL(ecdsa_determinism_test) {
 	name = dns_fixedname_initname(&fname);
 	isc_buffer_constinit(&keybuf, "example.", strlen("example."));
 	isc_buffer_add(&keybuf, strlen("example."));
-	result = dns_name_fromtext(name, &keybuf, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name, &keybuf, dns_rootname, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 	result = dst_key_fromfile(name, 19786, DST_ALG_ECDSA256,
 				  DST_TYPE_PUBLIC | DST_TYPE_PRIVATE,
diff --git a/tests/dns/keytable_test.c b/tests/dns/keytable_test.c
index 5b0ba19a3a..538a98bfeb 100644
--- a/tests/dns/keytable_test.c
+++ b/tests/dns/keytable_test.c
@@ -97,9 +97,8 @@ str2name(const char *namestr) {
 	name = dns_fixedname_initname(&fname);
 	isc_buffer_init(&namebuf, UNCONST(namestr), strlen(namestr));
 	isc_buffer_add(&namebuf, strlen(namestr));
-	assert_int_equal(
-		dns_name_fromtext(name, &namebuf, dns_rootname, 0, NULL),
-		ISC_R_SUCCESS);
+	assert_int_equal(dns_name_fromtext(name, &namebuf, dns_rootname, 0),
+			 ISC_R_SUCCESS);
 
 	return name;
 }
diff --git a/tests/dns/master_test.c b/tests/dns/master_test.c
index 6a2297876a..930e339475 100644
--- a/tests/dns/master_test.c
+++ b/tests/dns/master_test.c
@@ -100,7 +100,7 @@ setup_master(void (*warn)(struct dns_rdatacallbacks *, const char *, ...),
 	isc_buffer_setactive(&source, len);
 	dns_master_initrawheader(&header);
 
-	result = dns_name_fromtext(dns_origin, &source, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(dns_origin, &source, dns_rootname, 0);
 	if (result != ISC_R_SUCCESS) {
 		return result;
 	}
diff --git a/tests/dns/name_test.c b/tests/dns/name_test.c
index a786299a02..0b39ba2fe5 100644
--- a/tests/dns/name_test.c
+++ b/tests/dns/name_test.c
@@ -640,7 +640,7 @@ ISC_RUN_TEST_IMPL(isabsolute) {
 		dns_name_init(&name);
 		isc_buffer_init(&nb, data, BUFSIZ);
 		dns_name_setbuffer(&name, &nb);
-		result = dns_name_fromtext(&name, &b, NULL, 0, NULL);
+		result = dns_name_fromtext(&name, &b, NULL, 0);
 		assert_int_equal(result, ISC_R_SUCCESS);
 
 		assert_int_equal(dns_name_isabsolute(&name),
diff --git a/tests/dns/qpzone_test.c b/tests/dns/qpzone_test.c
index e3c693d4a9..7e716bf024 100644
--- a/tests/dns/qpzone_test.c
+++ b/tests/dns/qpzone_test.c
@@ -134,12 +134,12 @@ ownercase_test_one(const char *str1, const char *str2) {
 
 	isc_buffer_constinit(&b, str1, strlen(str1));
 	isc_buffer_add(&b, strlen(str1));
-	result = dns_name_fromtext(name1, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name1, &b, dns_rootname, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 
 	isc_buffer_constinit(&b, str2, strlen(str2));
 	isc_buffer_add(&b, strlen(str2));
-	result = dns_name_fromtext(name2, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name2, &b, dns_rootname, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 
 	/* Store the case from name1 */
@@ -206,12 +206,12 @@ ISC_RUN_TEST_IMPL(setownercase) {
 
 	isc_buffer_constinit(&b, str1, strlen(str1));
 	isc_buffer_add(&b, strlen(str1));
-	result = dns_name_fromtext(name1, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name1, &b, dns_rootname, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 
 	isc_buffer_constinit(&b, str1, strlen(str1));
 	isc_buffer_add(&b, strlen(str1));
-	result = dns_name_fromtext(name2, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(name2, &b, dns_rootname, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 
 	assert_false(CASESET(&header));
diff --git a/tests/dns/rsa_test.c b/tests/dns/rsa_test.c
index c1d44fa3f5..89a347e2e3 100644
--- a/tests/dns/rsa_test.c
+++ b/tests/dns/rsa_test.c
@@ -133,7 +133,7 @@ ISC_RUN_TEST_IMPL(isc_rsa_verify) {
 	name = dns_fixedname_initname(&fname);
 	isc_buffer_constinit(&buf, "rsa.", 4);
 	isc_buffer_add(&buf, 4);
-	ret = dns_name_fromtext(name, &buf, NULL, 0, NULL);
+	ret = dns_name_fromtext(name, &buf, NULL, 0);
 	assert_int_equal(ret, ISC_R_SUCCESS);
 
 	ret = dst_key_fromfile(name, 29238, DST_ALG_RSASHA256, DST_TYPE_PUBLIC,
diff --git a/tests/dns/skr_test.c b/tests/dns/skr_test.c
index a0038c6ddc..dbeb4a7cc8 100644
--- a/tests/dns/skr_test.c
+++ b/tests/dns/skr_test.c
@@ -448,7 +448,7 @@ ISC_RUN_TEST_IMPL(skr_read) {
 	dname = dns_fixedname_initname(&dfname);
 	isc_buffer_init(&b, name, strlen(name));
 	isc_buffer_add(&b, strlen(name));
-	result = dns_name_fromtext(dname, &b, dns_rootname, 0, NULL);
+	result = dns_name_fromtext(dname, &b, dns_rootname, 0);
 	assert_int_equal(result, ISC_R_SUCCESS);
 
 	/* Get the KSK */
diff --git a/tests/libtest/dns.c b/tests/libtest/dns.c
index 2ded8b3e3b..7c88b6f285 100644
--- a/tests/libtest/dns.c
+++ b/tests/libtest/dns.c
@@ -419,7 +419,7 @@ dns_test_namefromstring(const char *namestr, dns_fixedname_t *fname) {
 	isc_buffer_allocate(mctx, &b, length);
 
 	isc_buffer_putmem(b, (const unsigned char *)namestr, length);
-	result = dns_name_fromtext(name, b, NULL, 0, NULL);
+	result = dns_name_fromtext(name, b, NULL, 0);
 	INSIST(result == ISC_R_SUCCESS);
 
 	isc_buffer_free(&b);