diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 611d5cc70a..dc5053fa61 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.168 2001/01/30 05:56:58 gson Exp $ */
+/* $Id: adb.c,v 1.169 2001/02/05 19:47:01 bwelling Exp $ */
 
 /*
  * Implementation notes
@@ -2730,8 +2730,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
 	find->partial_result |= (adbname->partial_result & wanted_addresses);
 	if (alias) {
 		if (target != NULL) {
-			result = dns_name_concatenate(&adbname->target, NULL,
-						      target, NULL);
+			result = dns_name_copy(&adbname->target, target, NULL);
 			if (result != ISC_R_SUCCESS)
 				goto out;
 		}
diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c
index 7be7d0b22c..ba6976f5d2 100644
--- a/lib/dns/lookup.c
+++ b/lib/dns/lookup.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lookup.c,v 1.8 2001/01/09 21:51:00 bwelling Exp $ */
+/* $Id: lookup.c,v 1.9 2001/02/05 19:47:03 bwelling Exp $ */
 
 #include <config.h>
 
@@ -269,8 +269,7 @@ lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) {
 			dns_rdata_reset(&rdata);
 			if (result != ISC_R_SUCCESS)
 				break;
-			result = dns_name_concatenate(&cname.cname, NULL, name,
-						      NULL);
+			result = dns_name_copy(&cname.cname, name, NULL);
 			dns_rdata_freestruct(&cname);
 			if (result == ISC_R_SUCCESS)
 				want_restart = ISC_TRUE;
@@ -417,8 +416,7 @@ dns_lookup_create(isc_mem_t *mctx, dns_name_t *name, dns_rdatatype_t type,
 
 	dns_fixedname_init(&lookup->name);
 
-	result = dns_name_concatenate(name, NULL,
-				      dns_fixedname_name(&lookup->name), NULL);
+	result = dns_name_copy(name, dns_fixedname_name(&lookup->name), NULL);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_lock;
 
diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 7fd7b6235b..bdae69845b 100644
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.c,v 1.24 2001/01/09 21:51:32 bwelling Exp $ */
+/* $Id: sdb.c,v 1.25 2001/02/05 19:47:04 bwelling Exp $ */
 
 #include <config.h>
 
@@ -836,7 +836,7 @@ find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 	if (foundname != NULL) {
 		isc_result_t xresult;
 
-		xresult = dns_name_concatenate(xname, NULL, foundname, NULL);
+		xresult = dns_name_copy(xname, foundname, NULL);
 		if (xresult != ISC_R_SUCCESS) {
 			destroynode(node);
 			if (dns_rdataset_isassociated(rdataset))
@@ -1338,8 +1338,7 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep,
 
 	attachnode(iterator->db, sdbiter->current, nodep);
 	if (name != NULL)
-		return (dns_name_concatenate(sdbiter->current->name, NULL,
-					     name, NULL));
+		return (dns_name_copy(sdbiter->current->name, name, NULL));
 	return (ISC_R_SUCCESS);
 }
 
@@ -1352,7 +1351,7 @@ dbiterator_pause(dns_dbiterator_t *iterator) {
 static isc_result_t
 dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) {
 	UNUSED(iterator);
-	return (dns_name_concatenate(dns_rootname, NULL, name, NULL));
+	return (dns_name_copy(dns_rootname, name, NULL));
 }
 
 /*
diff --git a/lib/dns/view.c b/lib/dns/view.c
index fc4fa85b27..f0c45f6736 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.c,v 1.94 2001/02/01 21:29:38 marka Exp $ */
+/* $Id: view.c,v 1.95 2001/02/05 19:47:05 bwelling Exp $ */
 
 #include <config.h>
 
@@ -914,8 +914,7 @@ dns_view_findzonecut(dns_view_t *view, dns_name_t *name, dns_name_t *fname,
 			 * We found an answer, but the cache may be better.
 			 */
 			zfname = dns_fixedname_name(&zfixedname);
-			result = dns_name_concatenate(fname, NULL, zfname,
-						      NULL);
+			result = dns_name_copy(fname, zfname, NULL);
 			if (result != ISC_R_SUCCESS)
 				goto cleanup;
 			dns_rdataset_clone(rdataset, &zrdataset);
@@ -971,7 +970,7 @@ dns_view_findzonecut(dns_view_t *view, dns_name_t *name, dns_name_t *fname,
 			    dns_rdataset_isassociated(sigrdataset))
 				dns_rdataset_disassociate(sigrdataset);
 		}
-		result = dns_name_concatenate(zfname, NULL, fname, NULL);
+		result = dns_name_copy(zfname, fname, NULL);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup;
 		dns_rdataset_clone(&zrdataset, rdataset);