diff --git a/src/cfgparse.c b/src/cfgparse.c
index d4fac8c..84420d1 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -7080,7 +7080,7 @@
 				curproxy->be_rsp_ana |= AN_RES_STORE_RULES;
 
 			if (mrule->table.name)
-				target = findproxy(mrule->table.name, 0);
+				target = proxy_tbl_by_name(mrule->table.name);
 			else
 				target = curproxy;
 
@@ -7113,7 +7113,7 @@
 			curproxy->be_rsp_ana |= AN_RES_STORE_RULES;
 
 			if (mrule->table.name)
-				target = findproxy(mrule->table.name, 0);
+				target = proxy_tbl_by_name(mrule->table.name);
 			else
 				target = curproxy;
 
@@ -7147,7 +7147,7 @@
 				continue;
 
 			if (trule->act_prm.trk_ctr.table.n)
-				target = findproxy(trule->act_prm.trk_ctr.table.n, 0);
+				target = proxy_tbl_by_name(trule->act_prm.trk_ctr.table.n);
 			else
 				target = curproxy;
 
@@ -7186,7 +7186,7 @@
 				continue;
 
 			if (trule->act_prm.trk_ctr.table.n)
-				target = findproxy(trule->act_prm.trk_ctr.table.n, 0);
+				target = proxy_tbl_by_name(trule->act_prm.trk_ctr.table.n);
 			else
 				target = curproxy;
 
@@ -7225,7 +7225,7 @@
 				continue;
 
 			if (hrqrule->act_prm.trk_ctr.table.n)
-				target = findproxy(hrqrule->act_prm.trk_ctr.table.n, 0);
+				target = proxy_tbl_by_name(hrqrule->act_prm.trk_ctr.table.n);
 			else
 				target = curproxy;
 
@@ -7579,7 +7579,7 @@
 				}
 
 				if (pname) {
-					px = findproxy(pname, PR_CAP_BE);
+					px = proxy_be_by_name(pname);
 					if (!px) {
 						Alert("config : %s '%s', server '%s': unable to find required proxy '%s' for tracking.\n",
 							proxy_type_str(curproxy), curproxy->id,
