diff --git a/src/cart/crt_bulk.c b/src/cart/crt_bulk.c
index 13723634a8f..33532a8c98d 100644
--- a/src/cart/crt_bulk.c
+++ b/src/cart/crt_bulk.c
@@ -185,7 +185,7 @@ crt_bulk_transfer(struct crt_bulk_desc *bulk_desc, crt_bulk_cb_t complete_cb,
 	rc = crt_hg_bulk_transfer(bulk_desc, complete_cb, arg, opid, false);
 	if (rc != 0)
 		DL_ERROR(rc, "%p:%s crt_hg_bulk_transfer() failed", bulk_desc->bd_rpc,
-			 crt_rpc_get_origin_addr(bulk_desc->bd_rpc));
+			 crt_req_origin_addr_get(bulk_desc->bd_rpc));
 
 out:
 	return rc;
@@ -205,8 +205,8 @@ crt_bulk_bind_transfer(struct crt_bulk_desc *bulk_desc,
 
 	rc = crt_hg_bulk_transfer(bulk_desc, complete_cb, arg, opid, true);
 	if (rc != 0)
-		DL_ERROR(rc, "%p:%s crt_hg_bulk_transfer() failed.\n", bulk_desc->bd_rpc,
-			 crt_rpc_get_origin_addr(bulk_desc->bd_rpc));
+		DL_ERROR(rc, "%p:%s crt_hg_bulk_transfer() failed.", bulk_desc->bd_rpc,
+			 crt_req_origin_addr_get(bulk_desc->bd_rpc));
 
 out:
 	return rc;
diff --git a/src/cart/crt_hg.c b/src/cart/crt_hg.c
index 842cdce5945..0e38c721a7d 100644
--- a/src/cart/crt_hg.c
+++ b/src/cart/crt_hg.c
@@ -1870,7 +1870,7 @@ crt_hg_bulk_transfer(struct crt_bulk_desc *bulk_desc, crt_bulk_cb_t complete_cb,
 }
 
 char *
-crt_rpc_get_origin_addr(crt_rpc_t *rpc_pub)
+crt_req_origin_addr_get(crt_rpc_t *rpc_pub)
 {
 	struct crt_rpc_priv *rpc_priv;
 
diff --git a/src/cart/crt_internal.h b/src/cart/crt_internal.h
index 96faa6abfd3..a937c4c48c8 100644
--- a/src/cart/crt_internal.h
+++ b/src/cart/crt_internal.h
@@ -40,15 +40,15 @@ crt_rpc_priv_get_origin_addr(struct crt_rpc_priv *rpc_priv)
 
 	hg_info = HG_Get_info(rpc_priv->crp_hg_hdl);
 	if (hg_info == NULL)
-		return "None";
+		return "NOINFO";
 
 	rc = HG_Addr_to_string(hg_info->hg_class, addr, (hg_size_t *)&addr_size, hg_info->addr);
 	if (rc != 0)
-		return "None";
+		return "NONE";
 
 	D_ALLOC(rpc_priv->crp_orig_uri, addr_size);
 	if (rpc_priv->crp_orig_uri == NULL)
-		return "None";
+		return "NOMEM";
 
 	memcpy(rpc_priv->crp_orig_uri, addr, addr_size);
 
diff --git a/src/cart/crt_rpc.c b/src/cart/crt_rpc.c
index 7b8c550bff6..3a38123f567 100644
--- a/src/cart/crt_rpc.c
+++ b/src/cart/crt_rpc.c
@@ -1601,7 +1601,7 @@ crt_reply_send(crt_rpc_t *req)
 		rc = crt_hg_reply_send(rpc_priv);
 		if (rc != 0)
 			D_ERROR("crt_hg_reply_send failed, rc: %d,opc: %#x.: %s\n", rc,
-				rpc_priv->crp_pub.cr_opc, crt_rpc_get_origin_addr(req));
+				rpc_priv->crp_pub.cr_opc, crt_req_origin_addr_get(req));
 	}
 
 	rpc_priv->crp_reply_pending = 0;
diff --git a/src/include/cart/api.h b/src/include/cart/api.h
index d5fe9299036..1f1287c1b26 100644
--- a/src/include/cart/api.h
+++ b/src/include/cart/api.h
@@ -2383,7 +2383,7 @@ crt_req_get_proto_ver(crt_rpc_t *req);
  * \return			the origin address of the RPC
  */
 char *
-crt_rpc_get_origin_addr(crt_rpc_t *rpc);
+crt_req_origin_addr_get(crt_rpc_t *rpc);
 
 /** @}
  */
diff --git a/src/object/srv_obj.c b/src/object/srv_obj.c
index 51141e10a09..0bf07830c12 100644
--- a/src/object/srv_obj.c
+++ b/src/object/srv_obj.c
@@ -245,7 +245,7 @@ obj_bulk_comp_cb(const struct crt_bulk_cb_info *cb_info)
 	rpc = bulk_desc->bd_rpc;
 
 	if (cb_info->bci_rc != 0)
-		D_ERROR("rpc: %p:%s bulk transfer failed: %d\n", rpc, crt_rpc_get_origin_addr(rpc),
+		D_ERROR("rpc: %p:%s bulk transfer failed: %d\n", rpc, crt_req_origin_addr_get(rpc),
 			cb_info->bci_rc);
 
 	arg = (struct obj_bulk_args *)cb_info->bci_arg;
@@ -5785,7 +5785,7 @@ ds_obj_coll_punch_handler(crt_rpc_t *rpc)
 		  (ocpi->ocpi_flags & ORF_LEADER)
 		      ? "leader"
 		      : (ocpi->ocpi_tgts.ca_count == 1 ? "non-leader" : "relay-engine"),
-		  rpc, crt_rpc_get_origin_addr(rpc), DP_UOID(ocpi->ocpi_oid), dmi->dmi_xs_id,
+		  rpc, crt_req_origin_addr_get(rpc), DP_UOID(ocpi->ocpi_oid), dmi->dmi_xs_id,
 		  dmi->dmi_tgt_id, DP_UUID(ocpi->ocpi_po_uuid), DP_UUID(ocpi->ocpi_co_hdl),
 		  DP_UUID(ocpi->ocpi_co_uuid), ocpi->ocpi_epoch, ocpi->ocpi_map_ver, max_ver,
 		  DP_DTI(&ocpi->ocpi_xid), ocpi->ocpi_bulk_tgt_sz, ocpi->ocpi_bulk_tgt_nr,
@@ -5926,7 +5926,7 @@ ds_obj_coll_query_handler(crt_rpc_t *rpc)
 		"Handled collective query RPC %p:%s %s forwarding for obj " DF_UOID
 		" on rank %u XS %u/%u epc " DF_X64 " pmv %u, with dti " DF_DTI ", dct_nr %u, "
 		"forward width %u, forward depth %u\n: " DF_RC "\n",
-		rpc, crt_rpc_get_origin_addr(rpc),
+		rpc, crt_req_origin_addr_get(rpc),
 		ocqi->ocqi_tgts.ca_count <= 1 ? "without" : "with", DP_UOID(ocqi->ocqi_oid), myrank,
 		dmi->dmi_xs_id, tgt_id, ocqi->ocqi_epoch, ocqi->ocqi_map_ver,
 		DP_DTI(&ocqi->ocqi_xid), (unsigned int)ocqi->ocqi_tgts.ca_count,