diff --git a/openbsc/include/openbsc/vty.h b/openbsc/include/openbsc/vty.h
index 3346a2c..570f1fd 100644
--- a/openbsc/include/openbsc/vty.h
+++ b/openbsc/include/openbsc/vty.h
@@ -31,7 +31,7 @@
 	BSSGP_NODE,
 	OML_NODE,
 	NAT_NODE,
-	BSC_NODE,
+	NAT_BSC_NODE,
 };
 
 #endif
diff --git a/openbsc/src/common_vty.c b/openbsc/src/common_vty.c
index ffa676d..1d1ede6 100644
--- a/openbsc/src/common_vty.c
+++ b/openbsc/src/common_vty.c
@@ -76,7 +76,7 @@
 		vty->node = CONFIG_NODE;
 		vty->index = NULL;
 		break;
-	case BSC_NODE:
+	case NAT_BSC_NODE:
 		vty->node = NAT_NODE;
 		{
 			struct bsc_config *bsc_config = vty->index;
@@ -126,7 +126,7 @@
 			vty->index_sub = &ts->trx->description;
 		}
 		break;
-	case BSC_NODE:
+	case NAT_BSC_NODE:
 		vty->node = NAT_NODE;
 		{
 			struct bsc_config *bsc_config = vty->index;
diff --git a/openbsc/src/nat/bsc_nat_vty.c b/openbsc/src/nat/bsc_nat_vty.c
index 66c45f6..eea5dd8 100644
--- a/openbsc/src/nat/bsc_nat_vty.c
+++ b/openbsc/src/nat/bsc_nat_vty.c
@@ -41,7 +41,7 @@
 };
 
 static struct cmd_node bsc_node = {
-	BSC_NODE,
+	NAT_BSC_NODE,
 	"%s(bsc)#",
 	1,
 };
@@ -343,7 +343,7 @@
 		return CMD_WARNING;
 
 	vty->index = bsc;
-	vty->node = BSC_NODE;
+	vty->node = NAT_BSC_NODE;
 
 	return CMD_SUCCESS;
 }
@@ -541,14 +541,14 @@
 	/* BSC subgroups */
 	install_element(NAT_NODE, &cfg_bsc_cmd);
 	install_node(&bsc_node, config_write_bsc);
-	install_default(BSC_NODE);
-	install_element(BSC_NODE, &ournode_exit_cmd);
-	install_element(BSC_NODE, &ournode_end_cmd);
-	install_element(BSC_NODE, &cfg_bsc_token_cmd);
-	install_element(BSC_NODE, &cfg_bsc_lac_cmd);
-	install_element(BSC_NODE, &cfg_bsc_paging_cmd);
-	install_element(BSC_NODE, &cfg_bsc_desc_cmd);
-	install_element(BSC_NODE, &cfg_bsc_acc_lst_name_cmd);
+	install_default(NAT_BSC_NODE);
+	install_element(NAT_BSC_NODE, &ournode_exit_cmd);
+	install_element(NAT_BSC_NODE, &ournode_end_cmd);
+	install_element(NAT_BSC_NODE, &cfg_bsc_token_cmd);
+	install_element(NAT_BSC_NODE, &cfg_bsc_lac_cmd);
+	install_element(NAT_BSC_NODE, &cfg_bsc_paging_cmd);
+	install_element(NAT_BSC_NODE, &cfg_bsc_desc_cmd);
+	install_element(NAT_BSC_NODE, &cfg_bsc_acc_lst_name_cmd);
 
 	mgcp_vty_init();