diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c
index 0da1bc5..2dc873f 100644
--- a/src/e1_input_vty.c
+++ b/src/e1_input_vty.c
@@ -462,27 +462,27 @@
 
 int e1inp_vty_init(void)
 {
-	install_element(CONFIG_NODE, &cfg_e1inp_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_e1inp_cmd);
 	install_node(&e1inp_node, e1inp_config_write);
 
-	install_element(L_E1INP_NODE, &cfg_e1_pcap_cmd);
-	install_element(L_E1INP_NODE, &cfg_e1_no_pcap_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_pcap_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_no_pcap_cmd);
 
-	install_element(L_E1INP_NODE, &cfg_e1_line_driver_cmd);
-	install_element(L_E1INP_NODE, &cfg_e1_line_port_cmd);
-	install_element(L_E1INP_NODE, &cfg_e1_line_socket_cmd);
-	install_element(L_E1INP_NODE, &cfg_e1_line_name_cmd);
-	install_element(L_E1INP_NODE, &cfg_e1_line_keepalive_cmd);
-	install_element(L_E1INP_NODE, &cfg_e1_line_keepalive_params_cmd);
-	install_element(L_E1INP_NODE, &cfg_e1_line_no_keepalive_cmd);
-	install_element(L_E1INP_NODE, &cfg_e1_line_ipa_keepalive_cmd);
-	install_element(L_E1INP_NODE, &cfg_e1_line_no_ipa_keepalive_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_line_driver_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_line_port_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_line_socket_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_line_name_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_line_keepalive_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_line_keepalive_params_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_line_no_keepalive_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_line_ipa_keepalive_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_e1_line_no_ipa_keepalive_cmd);
 
-	install_element(L_E1INP_NODE, &cfg_ipa_bind_cmd);
+	install_lib_element(L_E1INP_NODE, &cfg_ipa_bind_cmd);
 
-	install_element_ve(&show_e1drv_cmd);
-	install_element_ve(&show_e1line_cmd);
-	install_element_ve(&show_e1ts_cmd);
+	install_lib_element_ve(&show_e1drv_cmd);
+	install_lib_element_ve(&show_e1line_cmd);
+	install_lib_element_ve(&show_e1ts_cmd);
 
 	return 0;
 }
diff --git a/src/ipa_proxy.c b/src/ipa_proxy.c
index 980add7..441dd3f 100644
--- a/src/ipa_proxy.c
+++ b/src/ipa_proxy.c
@@ -643,15 +643,15 @@
 	tall_ipa_proxy_ctx =
 		talloc_named_const(libosmo_abis_ctx, 1, "ipa_proxy");
 
-	install_element(ENABLE_NODE, &ipa_instance_add_cmd);
-	install_element(ENABLE_NODE, &ipa_instance_del_cmd);
-	install_element(ENABLE_NODE, &ipa_instance_show_cmd);
-	install_element(ENABLE_NODE, &ipa_route_add_cmd);
-	install_element(ENABLE_NODE, &ipa_route_del_cmd);
-	install_element(ENABLE_NODE, &ipa_route_show_cmd);
+	install_lib_element(ENABLE_NODE, &ipa_instance_add_cmd);
+	install_lib_element(ENABLE_NODE, &ipa_instance_del_cmd);
+	install_lib_element(ENABLE_NODE, &ipa_instance_show_cmd);
+	install_lib_element(ENABLE_NODE, &ipa_route_add_cmd);
+	install_lib_element(ENABLE_NODE, &ipa_route_del_cmd);
+	install_lib_element(ENABLE_NODE, &ipa_route_show_cmd);
 
-	install_element(CONFIG_NODE, &ipa_cfg_cmd);
+	install_lib_element(CONFIG_NODE, &ipa_cfg_cmd);
 	install_node(&ipa_node, ipa_cfg_write);
-	install_element(L_IPA_NODE, &ipa_instance_cfg_add_cmd);
-	install_element(L_IPA_NODE, &ipa_route_cfg_add_cmd);
+	install_lib_element(L_IPA_NODE, &ipa_instance_cfg_add_cmd);
+	install_lib_element(L_IPA_NODE, &ipa_route_cfg_add_cmd);
 }