diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
index 8765f27..dd32c75 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
@@ -809,7 +809,7 @@
 	uint8_t msg_type, proto;
 	unsigned int payload_len;
 	struct gsm_mncc_number called;
-	struct msg_entry *entry;
+	struct osmo_config_entry *entry;
 	char *new_number = NULL;
 	struct msgb *out, *sccp;
 	uint8_t *outptr;
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index a115fad..f56ebb8 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -462,7 +462,7 @@
 	if (_nat->num_rewr_name) {
 		if (_nat->num_rewr)
 			talloc_free(_nat->num_rewr);
-		_nat->num_rewr = msg_entry_parse(_nat, _nat->num_rewr_name);
+		_nat->num_rewr = osmo_config_list_parse(_nat, _nat->num_rewr_name);
 		return _nat->num_rewr == NULL ? CMD_WARNING : CMD_SUCCESS;
 	} else {
 		if (_nat->num_rewr)