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));