diff --git a/src/vty/command.c b/src/vty/command.c
index 398c716..cee590b 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -3903,20 +3903,20 @@
 /*! Install common commands like 'exit' and 'list'. */
 static void install_basic_node_commands(int node)
 {
-	install_element(node, &config_help_cmd);
-	install_element(node, &config_list_cmd);
+	install_lib_element(node, &config_help_cmd);
+	install_lib_element(node, &config_list_cmd);
 
-	install_element(node, &config_write_terminal_cmd);
-	install_element(node, &config_write_file_cmd);
-	install_element(node, &config_write_memory_cmd);
-	install_element(node, &config_write_cmd);
-	install_element(node, &show_running_config_cmd);
+	install_lib_element(node, &config_write_terminal_cmd);
+	install_lib_element(node, &config_write_file_cmd);
+	install_lib_element(node, &config_write_memory_cmd);
+	install_lib_element(node, &config_write_cmd);
+	install_lib_element(node, &show_running_config_cmd);
 
-	install_element(node, &config_exit_cmd);
+	install_lib_element(node, &config_exit_cmd);
 
 	if (node >= CONFIG_NODE) {
 		/* It's not a top node. */
-		install_element(node, &config_end_cmd);
+		install_lib_element(node, &config_end_cmd);
 	}
 }
 
@@ -4003,52 +4003,52 @@
 	install_node(&config_node, config_write_host);
 
 	/* Each node's basic commands. */
-	install_element(VIEW_NODE, &show_version_cmd);
-	install_element(VIEW_NODE, &show_online_help_cmd);
+	install_lib_element(VIEW_NODE, &show_version_cmd);
+	install_lib_element(VIEW_NODE, &show_online_help_cmd);
 	if (terminal) {
-		install_element(VIEW_NODE, &config_list_cmd);
-		install_element(VIEW_NODE, &config_exit_cmd);
-		install_element(VIEW_NODE, &config_help_cmd);
-		install_element(VIEW_NODE, &config_enable_cmd);
-		install_element(VIEW_NODE, &config_terminal_length_cmd);
-		install_element(VIEW_NODE, &config_terminal_no_length_cmd);
-		install_element(VIEW_NODE, &echo_cmd);
+		install_lib_element(VIEW_NODE, &config_list_cmd);
+		install_lib_element(VIEW_NODE, &config_exit_cmd);
+		install_lib_element(VIEW_NODE, &config_help_cmd);
+		install_lib_element(VIEW_NODE, &config_enable_cmd);
+		install_lib_element(VIEW_NODE, &config_terminal_length_cmd);
+		install_lib_element(VIEW_NODE, &config_terminal_no_length_cmd);
+		install_lib_element(VIEW_NODE, &echo_cmd);
 	}
 
 	if (terminal) {
-		install_element(ENABLE_NODE, &config_disable_cmd);
-		install_element(ENABLE_NODE, &config_terminal_cmd);
-		install_element (ENABLE_NODE, &copy_runningconfig_startupconfig_cmd);
+		install_lib_element(ENABLE_NODE, &config_disable_cmd);
+		install_lib_element(ENABLE_NODE, &config_terminal_cmd);
+		install_lib_element(ENABLE_NODE, &copy_runningconfig_startupconfig_cmd);
 	}
-	install_element (ENABLE_NODE, &show_startup_config_cmd);
-	install_element(ENABLE_NODE, &show_version_cmd);
-	install_element(ENABLE_NODE, &show_online_help_cmd);
+	install_lib_element(ENABLE_NODE, &show_startup_config_cmd);
+	install_lib_element(ENABLE_NODE, &show_version_cmd);
+	install_lib_element(ENABLE_NODE, &show_online_help_cmd);
 
 	if (terminal) {
-		install_element(ENABLE_NODE, &config_terminal_length_cmd);
-		install_element(ENABLE_NODE, &config_terminal_no_length_cmd);
-		install_element(ENABLE_NODE, &echo_cmd);
+		install_lib_element(ENABLE_NODE, &config_terminal_length_cmd);
+		install_lib_element(ENABLE_NODE, &config_terminal_no_length_cmd);
+		install_lib_element(ENABLE_NODE, &echo_cmd);
 	}
 
-	install_element(CONFIG_NODE, &hostname_cmd);
-	install_element(CONFIG_NODE, &no_hostname_cmd);
+	install_lib_element(CONFIG_NODE, &hostname_cmd);
+	install_lib_element(CONFIG_NODE, &no_hostname_cmd);
 
 	if (terminal) {
-		install_element(CONFIG_NODE, &password_cmd);
-		install_element(CONFIG_NODE, &password_text_cmd);
-		install_element(CONFIG_NODE, &enable_password_cmd);
-		install_element(CONFIG_NODE, &enable_password_text_cmd);
-		install_element(CONFIG_NODE, &no_enable_password_cmd);
+		install_lib_element(CONFIG_NODE, &password_cmd);
+		install_lib_element(CONFIG_NODE, &password_text_cmd);
+		install_lib_element(CONFIG_NODE, &enable_password_cmd);
+		install_lib_element(CONFIG_NODE, &enable_password_text_cmd);
+		install_lib_element(CONFIG_NODE, &no_enable_password_cmd);
 
 #ifdef VTY_CRYPT_PW
-		install_element(CONFIG_NODE, &service_password_encrypt_cmd);
-		install_element(CONFIG_NODE, &no_service_password_encrypt_cmd);
+		install_lib_element(CONFIG_NODE, &service_password_encrypt_cmd);
+		install_lib_element(CONFIG_NODE, &no_service_password_encrypt_cmd);
 #endif
-		install_element(CONFIG_NODE, &banner_motd_default_cmd);
-		install_element(CONFIG_NODE, &banner_motd_file_cmd);
-		install_element(CONFIG_NODE, &no_banner_motd_cmd);
-		install_element(CONFIG_NODE, &service_terminal_length_cmd);
-		install_element(CONFIG_NODE, &no_service_terminal_length_cmd);
+		install_lib_element(CONFIG_NODE, &banner_motd_default_cmd);
+		install_lib_element(CONFIG_NODE, &banner_motd_file_cmd);
+		install_lib_element(CONFIG_NODE, &no_banner_motd_cmd);
+		install_lib_element(CONFIG_NODE, &service_terminal_length_cmd);
+		install_lib_element(CONFIG_NODE, &no_service_terminal_length_cmd);
 
 	}
 	srand(time(NULL));
diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c
index 35671a9..0b72abb 100644
--- a/src/vty/cpu_sched_vty.c
+++ b/src/vty/cpu_sched_vty.c
@@ -604,13 +604,13 @@
 	INIT_LLIST_HEAD(&sched_vty_opts->cpu_affinity_li);
 	pthread_mutex_init(&sched_vty_opts->cpu_affinity_li_mutex, NULL);
 
-	install_element(CONFIG_NODE, &cfg_sched_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_sched_cmd);
 	install_node(&sched_node, config_write_sched);
 
-	install_element(L_CPU_SCHED_NODE, &cfg_sched_policy_cmd);
-	install_element(L_CPU_SCHED_NODE, &cfg_sched_cpu_affinity_cmd);
+	install_lib_element(L_CPU_SCHED_NODE, &cfg_sched_policy_cmd);
+	install_lib_element(L_CPU_SCHED_NODE, &cfg_sched_cpu_affinity_cmd);
 
-	install_element_ve(&show_sched_threads_cmd);
+	install_lib_element_ve(&show_sched_threads_cmd);
 
 	/* Initialize amount of cpus now */
 	if (get_num_cpus() < 0)
diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c
index 9bde241..3169ee7 100644
--- a/src/vty/fsm_vty.c
+++ b/src/vty/fsm_vty.c
@@ -196,9 +196,9 @@
 	if (osmo_fsm_vty_cmds_installed)
 		return;
 
-	install_element_ve(&show_fsm_cmd);
-	install_element_ve(&show_fsms_cmd);
-	install_element_ve(&show_fsm_inst_cmd);
-	install_element_ve(&show_fsm_insts_cmd);
+	install_lib_element_ve(&show_fsm_cmd);
+	install_lib_element_ve(&show_fsms_cmd);
+	install_lib_element_ve(&show_fsm_inst_cmd);
+	install_lib_element_ve(&show_fsm_insts_cmd);
 	osmo_fsm_vty_cmds_installed = true;
 }
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index bd513e3..200b45a 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -1016,7 +1016,7 @@
 		   "Deprecated Category\n";
 	cmd->attr = CMD_ATTR_DEPRECATED;
 
-	install_element(CFG_LOG_NODE, cmd);
+	install_lib_element(CFG_LOG_NODE, cmd);
 }
 
 /* logp (<categories>) (debug|...|fatal) .LOGMESSAGE*/
@@ -1064,18 +1064,18 @@
  *  your application if you want to support those commands. */
 void logging_vty_add_cmds()
 {
-	install_element_ve(&enable_logging_cmd);
-	install_element_ve(&disable_logging_cmd);
-	install_element_ve(&logging_fltr_all_cmd);
-	install_element_ve(&logging_use_clr_cmd);
-	install_element_ve(&logging_prnt_timestamp_cmd);
-	install_element_ve(&logging_prnt_ext_timestamp_cmd);
-	install_element_ve(&logging_prnt_cat_cmd);
-	install_element_ve(&logging_prnt_cat_hex_cmd);
-	install_element_ve(&logging_prnt_level_cmd);
-	install_element_ve(&logging_prnt_file_cmd);
-	install_element_ve(&logging_set_category_mask_cmd);
-	install_element_ve(&logging_set_category_mask_old_cmd);
+	install_lib_element_ve(&enable_logging_cmd);
+	install_lib_element_ve(&disable_logging_cmd);
+	install_lib_element_ve(&logging_fltr_all_cmd);
+	install_lib_element_ve(&logging_use_clr_cmd);
+	install_lib_element_ve(&logging_prnt_timestamp_cmd);
+	install_lib_element_ve(&logging_prnt_ext_timestamp_cmd);
+	install_lib_element_ve(&logging_prnt_cat_cmd);
+	install_lib_element_ve(&logging_prnt_cat_hex_cmd);
+	install_lib_element_ve(&logging_prnt_level_cmd);
+	install_lib_element_ve(&logging_prnt_file_cmd);
+	install_lib_element_ve(&logging_set_category_mask_cmd);
+	install_lib_element_ve(&logging_set_category_mask_old_cmd);
 
 	/* logging level (<categories>) (debug|...|fatal) */
 	gen_logging_level_cmd_strs(&logging_level_cmd,
@@ -1085,47 +1085,47 @@
 	gen_logging_level_cmd_strs(&deprecated_logging_level_everything_cmd,
 				   "everything", EVERYTHING_STR);
 
-	install_element_ve(&logging_level_cmd);
-	install_element_ve(&logging_level_set_all_cmd);
-	install_element_ve(&logging_level_force_all_cmd);
-	install_element_ve(&no_logging_level_force_all_cmd);
-	install_element_ve(&deprecated_logging_level_everything_cmd);
-	install_element_ve(&deprecated_logging_level_all_cmd);
-	install_element_ve(&deprecated_logging_level_all_everything_cmd);
+	install_lib_element_ve(&logging_level_cmd);
+	install_lib_element_ve(&logging_level_set_all_cmd);
+	install_lib_element_ve(&logging_level_force_all_cmd);
+	install_lib_element_ve(&no_logging_level_force_all_cmd);
+	install_lib_element_ve(&deprecated_logging_level_everything_cmd);
+	install_lib_element_ve(&deprecated_logging_level_all_cmd);
+	install_lib_element_ve(&deprecated_logging_level_all_everything_cmd);
 
 	gen_vty_logp_cmd_strs(&vty_logp_cmd);
-	install_element_ve(&vty_logp_cmd);
+	install_lib_element_ve(&vty_logp_cmd);
 
-	install_element_ve(&show_logging_vty_cmd);
-	install_element_ve(&show_alarms_cmd);
+	install_lib_element_ve(&show_logging_vty_cmd);
+	install_lib_element_ve(&show_alarms_cmd);
 
 	install_node(&cfg_log_node, config_write_log);
-	install_element(CFG_LOG_NODE, &logging_fltr_all_cmd);
-	install_element(CFG_LOG_NODE, &logging_use_clr_cmd);
-	install_element(CFG_LOG_NODE, &logging_prnt_timestamp_cmd);
-	install_element(CFG_LOG_NODE, &logging_prnt_ext_timestamp_cmd);
-	install_element(CFG_LOG_NODE, &logging_prnt_cat_cmd);
-	install_element(CFG_LOG_NODE, &logging_prnt_cat_hex_cmd);
-	install_element(CFG_LOG_NODE, &logging_prnt_level_cmd);
-	install_element(CFG_LOG_NODE, &logging_prnt_file_cmd);
-	install_element(CFG_LOG_NODE, &logging_level_cmd);
-	install_element(CFG_LOG_NODE, &logging_level_set_all_cmd);
-	install_element(CFG_LOG_NODE, &logging_level_force_all_cmd);
-	install_element(CFG_LOG_NODE, &no_logging_level_force_all_cmd);
-	install_element(CFG_LOG_NODE, &deprecated_logging_level_everything_cmd);
-	install_element(CFG_LOG_NODE, &deprecated_logging_level_all_cmd);
-	install_element(CFG_LOG_NODE, &deprecated_logging_level_all_everything_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_fltr_all_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_use_clr_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_prnt_timestamp_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_prnt_ext_timestamp_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_prnt_cat_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_prnt_cat_hex_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_prnt_level_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_prnt_file_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_level_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_level_set_all_cmd);
+	install_lib_element(CFG_LOG_NODE, &logging_level_force_all_cmd);
+	install_lib_element(CFG_LOG_NODE, &no_logging_level_force_all_cmd);
+	install_lib_element(CFG_LOG_NODE, &deprecated_logging_level_everything_cmd);
+	install_lib_element(CFG_LOG_NODE, &deprecated_logging_level_all_cmd);
+	install_lib_element(CFG_LOG_NODE, &deprecated_logging_level_all_everything_cmd);
 
-	install_element(CONFIG_NODE, &cfg_log_stderr_cmd);
-	install_element(CONFIG_NODE, &cfg_no_log_stderr_cmd);
-	install_element(CONFIG_NODE, &cfg_log_file_cmd);
-	install_element(CONFIG_NODE, &cfg_no_log_file_cmd);
-	install_element(CONFIG_NODE, &cfg_log_alarms_cmd);
-	install_element(CONFIG_NODE, &cfg_no_log_alarms_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_log_stderr_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_no_log_stderr_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_log_file_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_no_log_file_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_log_alarms_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_no_log_alarms_cmd);
 #ifdef HAVE_SYSLOG_H
-	install_element(CONFIG_NODE, &cfg_log_syslog_cmd);
-	install_element(CONFIG_NODE, &cfg_log_syslog_local_cmd);
-	install_element(CONFIG_NODE, &cfg_no_log_syslog_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_log_syslog_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_log_syslog_local_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_no_log_syslog_cmd);
 #endif
-	install_element(CONFIG_NODE, &cfg_log_gsmtap_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_log_gsmtap_cmd);
 }
diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c
index 1483eaa..630ee32 100644
--- a/src/vty/stats_vty.c
+++ b/src/vty/stats_vty.c
@@ -673,33 +673,33 @@
  */
 void osmo_stats_vty_add_cmds()
 {
-	install_element_ve(&show_stats_cmd);
-	install_element_ve(&show_stats_level_cmd);
+	install_lib_element_ve(&show_stats_cmd);
+	install_lib_element_ve(&show_stats_level_cmd);
 
-	install_element(CONFIG_NODE, &cfg_stats_reporter_statsd_cmd);
-	install_element(CONFIG_NODE, &cfg_no_stats_reporter_statsd_cmd);
-	install_element(CONFIG_NODE, &cfg_stats_reporter_log_cmd);
-	install_element(CONFIG_NODE, &cfg_no_stats_reporter_log_cmd);
-	install_element(CONFIG_NODE, &cfg_stats_interval_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_stats_reporter_statsd_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_no_stats_reporter_statsd_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_stats_reporter_log_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_no_stats_reporter_log_cmd);
+	install_lib_element(CONFIG_NODE, &cfg_stats_interval_cmd);
 
 	install_node(&cfg_stats_node, config_write_stats);
 
-	install_element(CFG_STATS_NODE, &cfg_stats_reporter_local_ip_cmd);
-	install_element(CFG_STATS_NODE, &cfg_no_stats_reporter_local_ip_cmd);
-	install_element(CFG_STATS_NODE, &cfg_stats_reporter_remote_ip_cmd);
-	install_element(CFG_STATS_NODE, &cfg_stats_reporter_remote_port_cmd);
-	install_element(CFG_STATS_NODE, &cfg_stats_reporter_mtu_cmd);
-	install_element(CFG_STATS_NODE, &cfg_no_stats_reporter_mtu_cmd);
-	install_element(CFG_STATS_NODE, &cfg_stats_reporter_prefix_cmd);
-	install_element(CFG_STATS_NODE, &cfg_no_stats_reporter_prefix_cmd);
-	install_element(CFG_STATS_NODE, &cfg_stats_reporter_level_cmd);
-	install_element(CFG_STATS_NODE, &cfg_stats_reporter_enable_cmd);
-	install_element(CFG_STATS_NODE, &cfg_stats_reporter_disable_cmd);
-	install_element(CFG_STATS_NODE, &cfg_stats_reporter_flush_period_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_stats_reporter_local_ip_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_no_stats_reporter_local_ip_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_stats_reporter_remote_ip_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_stats_reporter_remote_port_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_stats_reporter_mtu_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_no_stats_reporter_mtu_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_stats_reporter_prefix_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_no_stats_reporter_prefix_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_stats_reporter_level_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_stats_reporter_enable_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_stats_reporter_disable_cmd);
+	install_lib_element(CFG_STATS_NODE, &cfg_stats_reporter_flush_period_cmd);
 
-	install_element_ve(&show_stats_asciidoc_table_cmd);
-	install_element_ve(&show_rate_counters_cmd);
+	install_lib_element_ve(&show_stats_asciidoc_table_cmd);
+	install_lib_element_ve(&show_rate_counters_cmd);
 
-        install_element(ENABLE_NODE, &stats_report_cmd);
-        install_element(ENABLE_NODE, &stats_reset_cmd);
+        install_lib_element(ENABLE_NODE, &stats_report_cmd);
+        install_lib_element(ENABLE_NODE, &stats_reset_cmd);
 }
diff --git a/src/vty/talloc_ctx_vty.c b/src/vty/talloc_ctx_vty.c
index 16cb763..3966478 100644
--- a/src/vty/talloc_ctx_vty.c
+++ b/src/vty/talloc_ctx_vty.c
@@ -247,7 +247,7 @@
  */
 void osmo_talloc_vty_add_cmds(void)
 {
-	install_element_ve(&show_talloc_ctx_cmd);
-	install_element_ve(&show_talloc_ctx_tree_cmd);
-	install_element_ve(&show_talloc_ctx_filter_cmd);
+	install_lib_element_ve(&show_talloc_ctx_cmd);
+	install_lib_element_ve(&show_talloc_ctx_tree_cmd);
+	install_lib_element_ve(&show_talloc_ctx_filter_cmd);
 }
diff --git a/src/vty/tdef_vty.c b/src/vty/tdef_vty.c
index fe6d48b..0556d8c 100644
--- a/src/vty/tdef_vty.c
+++ b/src/vty/tdef_vty.c
@@ -379,8 +379,8 @@
 	cfg_timer_cmd.string = timer_command_string("timer", OSMO_TDEF_VTY_ARG_SET_OPTIONAL);
 	cfg_timer_cmd.doc = timer_doc_string("Configure or show timers\n", OSMO_TDEF_VTY_DOC_SET);
 
-	install_element_ve(&show_timer_cmd);
-	install_element(parent_cfg_node, &cfg_timer_cmd);
+	install_lib_element_ve(&show_timer_cmd);
+	install_lib_element(parent_cfg_node, &cfg_timer_cmd);
 }
 
 /*! Write the global osmo_tdef_group configuration to VTY, as previously passed to osmo_tdef_vty_groups_init().
diff --git a/src/vty/vty.c b/src/vty/vty.c
index 3b723e1..d12efa0 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -1834,18 +1834,18 @@
 	/* Install bgp top node. */
 	install_node(&vty_node, vty_config_write);
 
-	install_element_ve(&config_who_cmd);
-	install_element_ve(&show_history_cmd);
-	install_element(CONFIG_NODE, &line_vty_cmd);
-	install_element(CONFIG_NODE, &service_advanced_vty_cmd);
-	install_element(CONFIG_NODE, &no_service_advanced_vty_cmd);
-	install_element(CONFIG_NODE, &show_history_cmd);
-	install_element(ENABLE_NODE, &terminal_monitor_cmd);
-	install_element(ENABLE_NODE, &terminal_no_monitor_cmd);
+	install_lib_element_ve(&config_who_cmd);
+	install_lib_element_ve(&show_history_cmd);
+	install_lib_element(CONFIG_NODE, &line_vty_cmd);
+	install_lib_element(CONFIG_NODE, &service_advanced_vty_cmd);
+	install_lib_element(CONFIG_NODE, &no_service_advanced_vty_cmd);
+	install_lib_element(CONFIG_NODE, &show_history_cmd);
+	install_lib_element(ENABLE_NODE, &terminal_monitor_cmd);
+	install_lib_element(ENABLE_NODE, &terminal_no_monitor_cmd);
 
-	install_element(VTY_NODE, &vty_login_cmd);
-	install_element(VTY_NODE, &no_vty_login_cmd);
-	install_element(VTY_NODE, &vty_bind_cmd);
+	install_lib_element(VTY_NODE, &vty_login_cmd);
+	install_lib_element(VTY_NODE, &no_vty_login_cmd);
+	install_lib_element(VTY_NODE, &vty_bind_cmd);
 }
 
 /*! Read the configuration file using the VTY code