diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c
index c47695e..5bcc985 100644
--- a/openbsc/src/libbsc/abis_nm.c
+++ b/openbsc/src/libbsc/abis_nm.c
@@ -380,7 +380,8 @@
 	if (TLVP_PRESENT(&tp, NM_ATT_ADM_STATE)) {
 		new_state.administrative = *TLVP_VAL(&tp, NM_ATT_ADM_STATE);
 		DEBUGPC(DNM, "ADM=%2s ",
-			abis_nm_adm_state_name(new_state.administrative));
+			get_value_string(abis_nm_adm_state_names,
+					 new_state.administrative));
 	}
 	DEBUGPC(DNM, "\n");
 
diff --git a/openbsc/src/libbsc/abis_nm_vty.c b/openbsc/src/libbsc/abis_nm_vty.c
index d043c35..3a16b2b 100644
--- a/openbsc/src/libbsc/abis_nm_vty.c
+++ b/openbsc/src/libbsc/abis_nm_vty.c
@@ -86,7 +86,7 @@
 		return CMD_WARNING;
 
 	oms->bts = bts;
-	oms->obj_class = abis_nm_obj_class_name(argv[1]);
+	oms->obj_class = get_string_value(abis_nm_obj_class_names, argv[1]);
 	oms->obj_inst[0] = atoi(argv[2]);
 	oms->obj_inst[1] = atoi(argv[3]);
 	oms->obj_inst[2] = atoi(argv[4]);
@@ -161,7 +161,7 @@
 	struct oml_node_state *oms = vty->index;
 	enum abis_nm_adm_state state;
 
-	state = abis_nm_adm_state_name(argv[0]);
+	state = get_string_value(abis_nm_adm_state_names, argv[0]);
 
 	abis_nm_chg_adm_state(oms->bts, oms->obj_class, oms->obj_inst[0],
 			      oms->obj_inst[1], oms->obj_inst[2], state);
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index f1e964c..a72ff21 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -35,6 +35,7 @@
 #include <openbsc/abis_om2000.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/gsm/abis_nm.h>
 #include <openbsc/chan_alloc.h>
 #include <openbsc/meas_rep.h>
 #include <openbsc/db.h>